insideout10 / wordlift-plugin

src/public/class-wordlift-seo-service.php

Indentation +46 added lines, -46 removed lines

@@ -21,66 +21,66 @@
  */
 class Wordlift_Seo_Service {
 
-	/**
-	 * @inheritdoc
-	 */
-	function __construct() {
+    /**
+     * @inheritdoc
+     */
+    function __construct() {
 
-		// If we are not on the admin, run the get_term filter for entity type terms.
-		add_filter( 'get_wl_entity_type', array(
-			$this,
-			'get_wl_entity_type',
-		), 10, 2 );
+        // If we are not on the admin, run the get_term filter for entity type terms.
+        add_filter( 'get_wl_entity_type', array(
+            $this,
+            'get_wl_entity_type',
+        ), 10, 2 );
 
-	}
+    }
 
-	/**
-	 * Filter the entity term object, and when not in admin context replace title
-	 * and description with whatever was set in the entity settings page.
-	 *
-	 * @since    3.11
-	 *
-	 * @param WP_Term $term     The term to filters.
-	 * @param string  $taxonomy The taxonomy name.
-	 *
-	 * @return WP_Term The {@link WP_Term} with fields changed.
-	 */
-	function get_wl_entity_type( $term, $taxonomy ) {
+    /**
+     * Filter the entity term object, and when not in admin context replace title
+     * and description with whatever was set in the entity settings page.
+     *
+     * @since    3.11
+     *
+     * @param WP_Term $term     The term to filters.
+     * @param string  $taxonomy The taxonomy name.
+     *
+     * @return WP_Term The {@link WP_Term} with fields changed.
+     */
+    function get_wl_entity_type( $term, $taxonomy ) {
 
-		// Do nothing when in admin.
-		if ( is_admin() ) {
-			return $term;
-		}
+        // Do nothing when in admin.
+        if ( is_admin() ) {
+            return $term;
+        }
 
-		// Get the terms' settings.
-		$entity_settings = get_option( 'wl_entity_type_settings', array() );
+        // Get the terms' settings.
+        $entity_settings = get_option( 'wl_entity_type_settings', array() );
 
-		// If we have no settings for the specified term, then return the original
-		// term.
-		if ( ! isset( $entity_settings[ $term->term_id ] ) ) {
+        // If we have no settings for the specified term, then return the original
+        // term.
+        if ( ! isset( $entity_settings[ $term->term_id ] ) ) {
 
-			return $term;
-		}
+            return $term;
+        }
 
-		// Get the settings for the specified term.
-		$settings = $entity_settings[ $term->term_id ];
+        // Get the settings for the specified term.
+        $settings = $entity_settings[ $term->term_id ];
 
-		// Update the name.
-		if ( ! empty( $settings['title'] ) ) {
+        // Update the name.
+        if ( ! empty( $settings['title'] ) ) {
 
-			$term->name = $settings['title'];
+            $term->name = $settings['title'];
 
-		}
+        }
 
-		// Update the description.
-		if ( ! empty( $settings['description'] ) ) {
+        // Update the description.
+        if ( ! empty( $settings['description'] ) ) {
 
-			$term->description = $settings['description'];
+            $term->description = $settings['description'];
 
-		}
+        }
 
-		// Return the updated term.
-		return $term;
-	}
+        // Return the updated term.
+        return $term;
+    }
 
 }

Spacing +9 added lines, -9 removed lines

@@ -27,10 +27,10 @@ 
 	function __construct() {
 
 		// If we are not on the admin, run the get_term filter for entity type terms.
-		add_filter( 'get_wl_entity_type', array(
+		add_filter('get_wl_entity_type', array(
 			$this,
 			'get_wl_entity_type',
-		), 10, 2 );
+		), 10, 2);
 
 	}
 
@@ -45,35 +45,35 @@ 
 	 *
 	 * @return WP_Term The {@link WP_Term} with fields changed.
 	 */
-	function get_wl_entity_type( $term, $taxonomy ) {
+	function get_wl_entity_type($term, $taxonomy) {
 
 		// Do nothing when in admin.
-		if ( is_admin() ) {
+		if (is_admin()) {
 			return $term;
 		}
 
 		// Get the terms' settings.
-		$entity_settings = get_option( 'wl_entity_type_settings', array() );
+		$entity_settings = get_option('wl_entity_type_settings', array());
 
 		// If we have no settings for the specified term, then return the original
 		// term.
-		if ( ! isset( $entity_settings[ $term->term_id ] ) ) {
+		if ( ! isset($entity_settings[$term->term_id])) {
 
 			return $term;
 		}
 
 		// Get the settings for the specified term.
-		$settings = $entity_settings[ $term->term_id ];
+		$settings = $entity_settings[$term->term_id];
 
 		// Update the name.
-		if ( ! empty( $settings['title'] ) ) {
+		if ( ! empty($settings['title'])) {
 
 			$term->name = $settings['title'];
 
 		}
 
 		// Update the description.
-		if ( ! empty( $settings['description'] ) ) {
+		if ( ! empty($settings['description'])) {
 
 			$term->description = $settings['description'];
 

src/public/class-wordlift-widget.php

Indentation +16 added lines, -16 removed lines

@@ -16,26 +16,26 @@
  */
 abstract class Wordlift_Widget extends WP_Widget {
 
-	/**
-	 * @inheritdoc
-	 */
-	public function __construct( $id_base, $name, array $widget_options = array(), array $control_options = array() ) {
-		parent::__construct( $id_base, $name, $widget_options, $control_options );
+    /**
+     * @inheritdoc
+     */
+    public function __construct( $id_base, $name, array $widget_options = array(), array $control_options = array() ) {
+        parent::__construct( $id_base, $name, $widget_options, $control_options );
 
-		// Initialize the Related Entities Cloud Widget.
-		add_action( 'widgets_init', array( $this, 'widget_init' ) );
+        // Initialize the Related Entities Cloud Widget.
+        add_action( 'widgets_init', array( $this, 'widget_init' ) );
 
-	}
+    }
 
-	/**
-	 * Register the related entities cloud widget
-	 *
-	 * @since 3.11.0
-	 */
-	public function widget_init() {
+    /**
+     * Register the related entities cloud widget
+     *
+     * @since 3.11.0
+     */
+    public function widget_init() {
 
-		register_widget( get_class( $this ) );
+        register_widget( get_class( $this ) );
 
-	}
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -19,11 +19,11 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function __construct( $id_base, $name, array $widget_options = array(), array $control_options = array() ) {
-		parent::__construct( $id_base, $name, $widget_options, $control_options );
+	public function __construct($id_base, $name, array $widget_options = array(), array $control_options = array()) {
+		parent::__construct($id_base, $name, $widget_options, $control_options);
 
 		// Initialize the Related Entities Cloud Widget.
-		add_action( 'widgets_init', array( $this, 'widget_init' ) );
+		add_action('widgets_init', array($this, 'widget_init'));
 
 	}
 
@@ -34,7 +34,7 @@ 
 	 */
 	public function widget_init() {
 
-		register_widget( get_class( $this ) );
+		register_widget(get_class($this));
 
 	}
 

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

Indentation +74 added lines, -74 removed lines

@@ -7,111 +7,111 @@
  */
 class Wordlift_Log_Service {
 
-	const MESSAGE_TEMPLATE = '%-6s [%-40.40s] %s';
+    const MESSAGE_TEMPLATE = '%-6s [%-40.40s] %s';
 
-	const ERROR = 'ERROR';
-	const WARN = 'WARN';
-	const INFO = 'INFO';
-	const DEBUG = 'DEBUG';
-	const TRACE = 'TRACE';
+    const ERROR = 'ERROR';
+    const WARN = 'WARN';
+    const INFO = 'INFO';
+    const DEBUG = 'DEBUG';
+    const TRACE = 'TRACE';
 
 
-	/**
-	 * The class related to the logs.
-	 *
-	 * @since  1.0.0
-	 * @access private
-	 * @var string $class_name The class related to the logs.
-	 */
-	private $class_name;
+    /**
+     * The class related to the logs.
+     *
+     * @since  1.0.0
+     * @access private
+     * @var string $class_name The class related to the logs.
+     */
+    private $class_name;
 
-	/**
-	 * A singleton instance for legacy logging.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $instance A singleton instance for legacy logging.
-	 */
-	private static $instance = null;
+    /**
+     * A singleton instance for legacy logging.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var \Wordlift_Log_Service $instance A singleton instance for legacy logging.
+     */
+    private static $instance = null;
 
-	/**
-	 * Create an instance of the Log service.
-	 * @since 1.0.0
-	 *
-	 * @param string $class_name The class related to the logs.
-	 */
-	public function __construct( $class_name ) {
+    /**
+     * Create an instance of the Log service.
+     * @since 1.0.0
+     *
+     * @param string $class_name The class related to the logs.
+     */
+    public function __construct( $class_name ) {
 
-		$this->class_name = $class_name;
+        $this->class_name = $class_name;
 
-	}
+    }
 
-	/**
-	 * Get the ROOT logger.
-	 *
-	 * @since 3.10.0
-	 *
-	 * @return \Wordlift_Log_Service A singleton instance for legacy logging.
-	 */
-	public static function get_instance() {
+    /**
+     * Get the ROOT logger.
+     *
+     * @since 3.10.0
+     *
+     * @return \Wordlift_Log_Service A singleton instance for legacy logging.
+     */
+    public static function get_instance() {
 
-		return self::$instance ?: self::$instance = new Wordlift_Log_Service( 'ROOT' );
-	}
+        return self::$instance ?: self::$instance = new Wordlift_Log_Service( 'ROOT' );
+    }
 
 
-	public static function get_logger( $class_name ) {
+    public static function get_logger( $class_name ) {
 
-		return new Wordlift_Log_Service( $class_name );
+        return new Wordlift_Log_Service( $class_name );
 
-	}
+    }
 
-	/**
-	 * Log a message.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $level   The log level.
-	 * @param string $message The message to log.
-	 */
-	public function log( $level, $message ) {
+    /**
+     * Log a message.
+     *
+     * @since 1.0.0
+     *
+     * @param string $level   The log level.
+     * @param string $message The message to log.
+     */
+    public function log( $level, $message ) {
 
-		// If we're tracing or debugging, but the debug flag isn't set, then we don't log.
-		if ( ( self::TRACE === $level || self::DEBUG === $level ) && ( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) ) {
-			return;
-		}
+        // If we're tracing or debugging, but the debug flag isn't set, then we don't log.
+        if ( ( self::TRACE === $level || self::DEBUG === $level ) && ( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) ) {
+            return;
+        }
 
-		error_log( sprintf( self::MESSAGE_TEMPLATE, $level, $this->class_name, is_array( $message ) ? implode( ', ', $message ) : $message ) );
+        error_log( sprintf( self::MESSAGE_TEMPLATE, $level, $this->class_name, is_array( $message ) ? implode( ', ', $message ) : $message ) );
 
-	}
+    }
 
-	public function error( $message ) {
+    public function error( $message ) {
 
-		$this->log( self::ERROR, $message );
+        $this->log( self::ERROR, $message );
 
-	}
+    }
 
-	public function warn( $message ) {
+    public function warn( $message ) {
 
-		$this->log( self::WARN, $message );
+        $this->log( self::WARN, $message );
 
-	}
+    }
 
-	public function info( $message ) {
+    public function info( $message ) {
 
-		$this->log( self::INFO, $message );
+        $this->log( self::INFO, $message );
 
-	}
+    }
 
-	public function debug( $message ) {
+    public function debug( $message ) {
 
-		$this->log( self::DEBUG, $message );
+        $this->log( self::DEBUG, $message );
 
-	}
+    }
 
-	public function trace( $message ) {
+    public function trace( $message ) {
 
-		$this->log( self::TRACE, $message );
+        $this->log( self::TRACE, $message );
 
-	}
+    }
 
 }

Spacing +17 added lines, -17 removed lines

@@ -40,7 +40,7 @@ 
 	 *
 	 * @param string $class_name The class related to the logs.
 	 */
-	public function __construct( $class_name ) {
+	public function __construct($class_name) {
 
 		$this->class_name = $class_name;
 
@@ -55,13 +55,13 @@ 
 	 */
 	public static function get_instance() {
 
-		return self::$instance ?: self::$instance = new Wordlift_Log_Service( 'ROOT' );
+		return self::$instance ?: self::$instance = new Wordlift_Log_Service('ROOT');
 	}
 
 
-	public static function get_logger( $class_name ) {
+	public static function get_logger($class_name) {
 
-		return new Wordlift_Log_Service( $class_name );
+		return new Wordlift_Log_Service($class_name);
 
 	}
 
@@ -73,44 +73,44 @@ 
 	 * @param string $level   The log level.
 	 * @param string $message The message to log.
 	 */
-	public function log( $level, $message ) {
+	public function log($level, $message) {
 
 		// If we're tracing or debugging, but the debug flag isn't set, then we don't log.
-		if ( ( self::TRACE === $level || self::DEBUG === $level ) && ( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) ) {
+		if ((self::TRACE === $level || self::DEBUG === $level) && ( ! defined('WP_DEBUG') || ! WP_DEBUG)) {
 			return;
 		}
 
-		error_log( sprintf( self::MESSAGE_TEMPLATE, $level, $this->class_name, is_array( $message ) ? implode( ', ', $message ) : $message ) );
+		error_log(sprintf(self::MESSAGE_TEMPLATE, $level, $this->class_name, is_array($message) ? implode(', ', $message) : $message));
 
 	}
 
-	public function error( $message ) {
+	public function error($message) {
 
-		$this->log( self::ERROR, $message );
+		$this->log(self::ERROR, $message);
 
 	}
 
-	public function warn( $message ) {
+	public function warn($message) {
 
-		$this->log( self::WARN, $message );
+		$this->log(self::WARN, $message);
 
 	}
 
-	public function info( $message ) {
+	public function info($message) {
 
-		$this->log( self::INFO, $message );
+		$this->log(self::INFO, $message);
 
 	}
 
-	public function debug( $message ) {
+	public function debug($message) {
 
-		$this->log( self::DEBUG, $message );
+		$this->log(self::DEBUG, $message);
 
 	}
 
-	public function trace( $message ) {
+	public function trace($message) {
 
-		$this->log( self::TRACE, $message );
+		$this->log(self::TRACE, $message);
 
 	}
 

src/includes/class-wordlift-key-validation-service.php

Indentation +37 added lines, -37 removed lines

@@ -17,42 +17,42 @@
  */
 class Wordlift_Key_Validation_Service {
 
-	/**
-	 * Validate the provided key.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @param string $key WordLift's key to validate.
-	 *
-	 * @return bool True if the key is valid, otherwise false.
-	 */
-	public function is_valid( $key ) {
-
-		// Request the dataset URI as a way to validate the key
-		$response = wp_remote_get( wl_configuration_get_accounts_by_key_dataset_uri( $key ), unserialize( WL_REDLINK_API_HTTP_OPTIONS ) );
-
-		// If the response is valid, the key is valid.
-		return ! is_wp_error( $response ) && 200 === (int) $response['response']['code'];
-	}
-
-	/**
-	 * This function is hooked to the `wl_validate_key` AJAX call.
-	 *
-	 * @since 3.9.0
-	 */
-	public function validate_key() {
-
-		// Ensure we don't have garbage before us.
-		ob_clean();
-
-		// Check if we have a key.
-		if ( ! isset( $_POST['key'] ) ) {
-			wp_send_json_error( 'The key parameter is required.' );
-		}
-
-		// Set a response with valid set to true or false according to the key validity.
-		wp_send_json_success( array( 'valid' => $this->is_valid( $_POST['key'] ) ) );
-
-	}
+    /**
+     * Validate the provided key.
+     *
+     * @since 3.9.0
+     *
+     * @param string $key WordLift's key to validate.
+     *
+     * @return bool True if the key is valid, otherwise false.
+     */
+    public function is_valid( $key ) {
+
+        // Request the dataset URI as a way to validate the key
+        $response = wp_remote_get( wl_configuration_get_accounts_by_key_dataset_uri( $key ), unserialize( WL_REDLINK_API_HTTP_OPTIONS ) );
+
+        // If the response is valid, the key is valid.
+        return ! is_wp_error( $response ) && 200 === (int) $response['response']['code'];
+    }
+
+    /**
+     * This function is hooked to the `wl_validate_key` AJAX call.
+     *
+     * @since 3.9.0
+     */
+    public function validate_key() {
+
+        // Ensure we don't have garbage before us.
+        ob_clean();
+
+        // Check if we have a key.
+        if ( ! isset( $_POST['key'] ) ) {
+            wp_send_json_error( 'The key parameter is required.' );
+        }
+
+        // Set a response with valid set to true or false according to the key validity.
+        wp_send_json_success( array( 'valid' => $this->is_valid( $_POST['key'] ) ) );
+
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -26,13 +26,13 @@ 
 	 *
 	 * @return bool True if the key is valid, otherwise false.
 	 */
-	public function is_valid( $key ) {
+	public function is_valid($key) {
 
 		// Request the dataset URI as a way to validate the key
-		$response = wp_remote_get( wl_configuration_get_accounts_by_key_dataset_uri( $key ), unserialize( WL_REDLINK_API_HTTP_OPTIONS ) );
+		$response = wp_remote_get(wl_configuration_get_accounts_by_key_dataset_uri($key), unserialize(WL_REDLINK_API_HTTP_OPTIONS));
 
 		// If the response is valid, the key is valid.
-		return ! is_wp_error( $response ) && 200 === (int) $response['response']['code'];
+		return ! is_wp_error($response) && 200 === (int) $response['response']['code'];
 	}
 
 	/**
@@ -46,12 +46,12 @@ 
 		ob_clean();
 
 		// Check if we have a key.
-		if ( ! isset( $_POST['key'] ) ) {
-			wp_send_json_error( 'The key parameter is required.' );
+		if ( ! isset($_POST['key'])) {
+			wp_send_json_error('The key parameter is required.');
 		}
 
 		// Set a response with valid set to true or false according to the key validity.
-		wp_send_json_success( array( 'valid' => $this->is_valid( $_POST['key'] ) ) );
+		wp_send_json_success(array('valid' => $this->is_valid($_POST['key'])));
 
 	}
 

src/includes/class-wordlift-publisher-ajax-adapter.php

Indentation +40 added lines, -40 removed lines

@@ -16,55 +16,55 @@
  */
 class Wordlift_Publisher_Ajax_Adapter {
 
-	/**
-	 * The {@link Wordlift_Publisher_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
-	 */
-	private $publisher_service;
+    /**
+     * The {@link Wordlift_Publisher_Service} instance.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
+     */
+    private $publisher_service;
 
-	/**
-	 * Create a {@link Wordlift_Publisher_Ajax_Adapter} instance.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param \Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
-	 */
-	function __construct( $publisher_service ) {
+    /**
+     * Create a {@link Wordlift_Publisher_Ajax_Adapter} instance.
+     *
+     * @since 3.11.0
+     *
+     * @param \Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
+     */
+    function __construct( $publisher_service ) {
 
-		$this->publisher_service = $publisher_service;
+        $this->publisher_service = $publisher_service;
 
-	}
+    }
 
-	/**
-	 * The publisher AJAX action. This function is hook to the `wl_publisher`
-	 * action.
-	 *
-	 * @since 3.11.0
-	 */
-	public function publisher() {
+    /**
+     * The publisher AJAX action. This function is hook to the `wl_publisher`
+     * action.
+     *
+     * @since 3.11.0
+     */
+    public function publisher() {
 
-		// Ensure we don't have garbage before us.
-		ob_clean();
+        // Ensure we don't have garbage before us.
+        ob_clean();
 
-		// Check if the current user can `manage_options`.
-		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_send_json_error( 'Access denied.' );
-		}
+        // Check if the current user can `manage_options`.
+        if ( ! current_user_can( 'manage_options' ) ) {
+            wp_send_json_error( 'Access denied.' );
+        }
 
-		// No actual search parameter was passed, bail out.
-		if ( ! isset( $_POST['q'] ) || empty( $_POST['q'] ) ) {
-			wp_send_json_error( 'The q parameter is required.' );
-		}
+        // No actual search parameter was passed, bail out.
+        if ( ! isset( $_POST['q'] ) || empty( $_POST['q'] ) ) {
+            wp_send_json_error( 'The q parameter is required.' );
+        }
 
-		// Get the response.
-		$response = $this->publisher_service->query( $_POST['q'] );
+        // Get the response.
+        $response = $this->publisher_service->query( $_POST['q'] );
 
-		// Finally output the response.
-		wp_send_json_success( $response );
+        // Finally output the response.
+        wp_send_json_success( $response );
 
-	}
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -32,7 +32,7 @@ 
 	 *
 	 * @param \Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
 	 */
-	function __construct( $publisher_service ) {
+	function __construct($publisher_service) {
 
 		$this->publisher_service = $publisher_service;
 
@@ -50,20 +50,20 @@ 
 		ob_clean();
 
 		// Check if the current user can `manage_options`.
-		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_send_json_error( 'Access denied.' );
+		if ( ! current_user_can('manage_options')) {
+			wp_send_json_error('Access denied.');
 		}
 
 		// No actual search parameter was passed, bail out.
-		if ( ! isset( $_POST['q'] ) || empty( $_POST['q'] ) ) {
-			wp_send_json_error( 'The q parameter is required.' );
+		if ( ! isset($_POST['q']) || empty($_POST['q'])) {
+			wp_send_json_error('The q parameter is required.');
 		}
 
 		// Get the response.
-		$response = $this->publisher_service->query( $_POST['q'] );
+		$response = $this->publisher_service->query($_POST['q']);
 
 		// Finally output the response.
-		wp_send_json_success( $response );
+		wp_send_json_success($response);
 
 	}
 

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

Indentation +147 added lines, -147 removed lines

@@ -16,152 +16,152 @@
  */
 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 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.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @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.
-	 */
-	public function __construct( $post_type, $slug ) {
-
-
-		$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 ?: $post_type;
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the entity type service singleton instance.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @return Wordlift_Entity_Post_Type_Service The entity type service singleton instance.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get the entity type slug.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @return string The entity type slug.
-	 */
-	public function get_slug() {
-
-		return $this->slug;
-	}
-
-	/**
-	 * Get the entity post type name.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @return string The entity post type.
-	 */
-	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() {
-
-		$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',
-				// Disabling revisions support.
-				//
-				// See https://github.com/insideout10/wordlift-plugin/issues/462
-				// 'revisions',
-			),
-			'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 ),
-		);
-
-		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 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.
+     *
+     * @since 3.6.0
+     *
+     * @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.
+     */
+    public function __construct( $post_type, $slug ) {
+
+
+        $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 ?: $post_type;
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the entity type service singleton instance.
+     *
+     * @since 3.6.0
+     *
+     * @return Wordlift_Entity_Post_Type_Service The entity type service singleton instance.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Get the entity type slug.
+     *
+     * @since 3.6.0
+     *
+     * @return string The entity type slug.
+     */
+    public function get_slug() {
+
+        return $this->slug;
+    }
+
+    /**
+     * Get the entity post type name.
+     *
+     * @since 3.6.0
+     *
+     * @return string The entity post type.
+     */
+    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() {
+
+        $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',
+                // Disabling revisions support.
+                //
+                // See https://github.com/insideout10/wordlift-plugin/issues/462
+                // 'revisions',
+            ),
+            '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 ),
+        );
+
+        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 +17 added lines, -17 removed lines

@@ -51,7 +51,7 @@ 
 	 * @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.
 	 */
-	public function __construct( $post_type, $slug ) {
+	public function __construct($post_type, $slug) {
 
 
 		$this->post_type = $post_type;
@@ -109,19 +109,19 @@ 
 	public function register() {
 
 		$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(
@@ -146,12 +146,12 @@ 
 				// 'revisions',
 			),
 			'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),
 		);
 
-		register_post_type( $this->post_type, $args );
+		register_post_type($this->post_type, $args);
 
 		// Enable WP's standard `category` taxonomy for entities.
 		//
@@ -160,7 +160,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-content-filter-service.php

Indentation +87 added lines, -87 removed lines

@@ -18,92 +18,92 @@
  */
 class Wordlift_Content_Filter_Service {
 
-	/**
-	 * The pattern to find entities in text.
-	 *
-	 * @since 3.8.0
-	 */
-	const PATTERN = '/<(\\w+)[^<]*class="([^"]*)"\\sitemid=\"([^"]+)\"[^>]*>([^<]*)<\\/\\1>/i';
-
-	/**
-	 * A {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.8.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * Wordlift_Content_Filter_Service constructor.
-	 *
-	 * @since 3.8.0
-	 *
-	 * @param $entity_service
-	 */
-	public function __construct( $entity_service ) {
-
-		$this->entity_service = $entity_service;
-
-	}
-
-	/**
-	 * Mangle the content by adding links to the entity pages. This function is
-	 * hooked to the 'the_content' WP's filter.
-	 *
-	 * @since 3.8.0
-	 *
-	 * @param string $content The content being filtered.
-	 *
-	 * @return string The filtered content.
-	 */
-	public function the_content( $content ) {
-
-		// Replace each match of the entity tag with the entity link. If an error
-		// occurs fail silently returning the original content.
-		return preg_replace_callback( self::PATTERN, array(
-			$this,
-			'link',
-		), $content ) ?: $content;
-	}
-
-	/**
-	 * Get the entity match and replace it with a page link.
-	 *
-	 * @since 3.8.0
-	 *
-	 * @param array $matches An array of matches.
-	 *
-	 * @return string The replaced text with the link to the entity page.
-	 */
-	private function link( $matches ) {
-
-		// Get the entity itemid URI and label.
-		$css_class = $matches[2];
-		$uri       = $matches[3];
-		$label     = $matches[4];
-
-		// Get the entity post by URI.
-		if ( null === ( $post = $this->entity_service->get_entity_post_by_uri( $uri ) ) ) {
-
-			// If the entity post is not found return the label w/o the markup
-			// around it.
-			//
-			// See https://github.com/insideout10/wordlift-plugin/issues/461
-			return $label;
-		}
-
-		// If the `wl-no-link` class is set on the text annotation then we return
-		// the label with no anchor.
-		if ( - 1 < strpos( $css_class, 'wl-no-link' ) ) {
-			return $label;
-		}
-
-		// Get the link.
-		$link = get_permalink( $post );
-
-		// Return the link.
-		return "<a class='wl-entity-page-link' href='$link'>$label</a>";
-	}
+    /**
+     * The pattern to find entities in text.
+     *
+     * @since 3.8.0
+     */
+    const PATTERN = '/<(\\w+)[^<]*class="([^"]*)"\\sitemid=\"([^"]+)\"[^>]*>([^<]*)<\\/\\1>/i';
+
+    /**
+     * A {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.8.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+
+    /**
+     * Wordlift_Content_Filter_Service constructor.
+     *
+     * @since 3.8.0
+     *
+     * @param $entity_service
+     */
+    public function __construct( $entity_service ) {
+
+        $this->entity_service = $entity_service;
+
+    }
+
+    /**
+     * Mangle the content by adding links to the entity pages. This function is
+     * hooked to the 'the_content' WP's filter.
+     *
+     * @since 3.8.0
+     *
+     * @param string $content The content being filtered.
+     *
+     * @return string The filtered content.
+     */
+    public function the_content( $content ) {
+
+        // Replace each match of the entity tag with the entity link. If an error
+        // occurs fail silently returning the original content.
+        return preg_replace_callback( self::PATTERN, array(
+            $this,
+            'link',
+        ), $content ) ?: $content;
+    }
+
+    /**
+     * Get the entity match and replace it with a page link.
+     *
+     * @since 3.8.0
+     *
+     * @param array $matches An array of matches.
+     *
+     * @return string The replaced text with the link to the entity page.
+     */
+    private function link( $matches ) {
+
+        // Get the entity itemid URI and label.
+        $css_class = $matches[2];
+        $uri       = $matches[3];
+        $label     = $matches[4];
+
+        // Get the entity post by URI.
+        if ( null === ( $post = $this->entity_service->get_entity_post_by_uri( $uri ) ) ) {
+
+            // If the entity post is not found return the label w/o the markup
+            // around it.
+            //
+            // See https://github.com/insideout10/wordlift-plugin/issues/461
+            return $label;
+        }
+
+        // If the `wl-no-link` class is set on the text annotation then we return
+        // the label with no anchor.
+        if ( - 1 < strpos( $css_class, 'wl-no-link' ) ) {
+            return $label;
+        }
+
+        // Get the link.
+        $link = get_permalink( $post );
+
+        // Return the link.
+        return "<a class='wl-entity-page-link' href='$link'>$label</a>";
+    }
 
 }

Spacing +8 added lines, -8 removed lines

@@ -41,7 +41,7 @@ 
 	 *
 	 * @param $entity_service
 	 */
-	public function __construct( $entity_service ) {
+	public function __construct($entity_service) {
 
 		$this->entity_service = $entity_service;
 
@@ -57,14 +57,14 @@ 
 	 *
 	 * @return string The filtered content.
 	 */
-	public function the_content( $content ) {
+	public function the_content($content) {
 
 		// Replace each match of the entity tag with the entity link. If an error
 		// occurs fail silently returning the original content.
-		return preg_replace_callback( self::PATTERN, array(
+		return preg_replace_callback(self::PATTERN, array(
 			$this,
 			'link',
-		), $content ) ?: $content;
+		), $content) ?: $content;
 	}
 
 	/**
@@ -76,7 +76,7 @@ 
 	 *
 	 * @return string The replaced text with the link to the entity page.
 	 */
-	private function link( $matches ) {
+	private function link($matches) {
 
 		// Get the entity itemid URI and label.
 		$css_class = $matches[2];
@@ -84,7 +84,7 @@ 
 		$label     = $matches[4];
 
 		// Get the entity post by URI.
-		if ( null === ( $post = $this->entity_service->get_entity_post_by_uri( $uri ) ) ) {
+		if (null === ($post = $this->entity_service->get_entity_post_by_uri($uri))) {
 
 			// If the entity post is not found return the label w/o the markup
 			// around it.
@@ -95,12 +95,12 @@ 
 
 		// If the `wl-no-link` class is set on the text annotation then we return
 		// the label with no anchor.
-		if ( - 1 < strpos( $css_class, 'wl-no-link' ) ) {
+		if ( -1 < strpos($css_class, 'wl-no-link') ) {
 			return $label;
 		}
 
 		// Get the link.
-		$link = get_permalink( $post );
+		$link = get_permalink($post);
 
 		// Return the link.
 		return "<a class='wl-entity-page-link' href='$link'>$label</a>";

src/includes/class-wordlift-category-taxonomy-service.php

Indentation +59 added lines, -59 removed lines

@@ -18,74 +18,74 @@
  */
 class Wordlift_Category_Taxonomy_Service {
 
-	/**
-	 * The {@link Wordlift_Entity_Post_Type_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Entity_Post_Type_Service $entity_post_type_service The {@link Wordlift_Entity_Post_Type_Service} instance.
-	 */
-	private $entity_post_type_service;
+    /**
+     * The {@link Wordlift_Entity_Post_Type_Service} instance.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Entity_Post_Type_Service $entity_post_type_service The {@link Wordlift_Entity_Post_Type_Service} instance.
+     */
+    private $entity_post_type_service;
 
-	/**
-	 * Create a {@link Wordlift_Category_Taxonomy_Service} instance.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param \Wordlift_Entity_Post_Type_Service $entity_post_type_service The {@link Wordlift_Entity_Post_Type_Service} instance.
-	 */
-	function __construct( $entity_post_type_service ) {
+    /**
+     * Create a {@link Wordlift_Category_Taxonomy_Service} instance.
+     *
+     * @since 3.11.0
+     *
+     * @param \Wordlift_Entity_Post_Type_Service $entity_post_type_service The {@link Wordlift_Entity_Post_Type_Service} instance.
+     */
+    function __construct( $entity_post_type_service ) {
 
-		$this->entity_post_type_service = $entity_post_type_service;
+        $this->entity_post_type_service = $entity_post_type_service;
 
-	}
+    }
 
-	/**
-	 * Set the entity post types as one to be included in archive pages.
-	 *
-	 * In order to have entities show up in standard WP categories (Posts categories)
-	 * we configure the `entity` post type, but we also need to alter the main
-	 * WP query (which by default queries posts only) to include the `entities`.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param WP_Query $query WP's {@link WP_Query} instance.
-	 */
-	public function pre_get_posts( $query ) {
+    /**
+     * Set the entity post types as one to be included in archive pages.
+     *
+     * In order to have entities show up in standard WP categories (Posts categories)
+     * we configure the `entity` post type, but we also need to alter the main
+     * WP query (which by default queries posts only) to include the `entities`.
+     *
+     * @since 3.11.0
+     *
+     * @param WP_Query $query WP's {@link WP_Query} instance.
+     */
+    public function pre_get_posts( $query ) {
 
-		// Only for the main query, avoid problems with widgets and what not.
-		if ( ! $query->is_main_query() ) {
-			return;
-		}
+        // Only for the main query, avoid problems with widgets and what not.
+        if ( ! $query->is_main_query() ) {
+            return;
+        }
 
-		// We don't want to alter the query if we're in the admin UI, if this is
-		// not a category query, or if the `suppress_filters` is set.
-		//
-		// Note that it is unlikely for `suppress_filter` to be set on the front
-		// end, but let's be safe if it is set the calling code assumes no
-		// modifications of queries.
-		//
-		// is_admin is needed, otherwise category based post filters will show
-		// both types and at the current release (4.7) it causes PHP errors.
-		if ( is_admin() || ! is_category() || ! empty( $query->query_vars['suppress_filters'] ) ) {
-			return;
-		}
+        // We don't want to alter the query if we're in the admin UI, if this is
+        // not a category query, or if the `suppress_filters` is set.
+        //
+        // Note that it is unlikely for `suppress_filter` to be set on the front
+        // end, but let's be safe if it is set the calling code assumes no
+        // modifications of queries.
+        //
+        // is_admin is needed, otherwise category based post filters will show
+        // both types and at the current release (4.7) it causes PHP errors.
+        if ( is_admin() || ! is_category() || ! empty( $query->query_vars['suppress_filters'] ) ) {
+            return;
+        }
 
-		// Check the current post types, maybe the category archive pages
-		// are already associated with other post types.
-		//
-		// If `post_type` isn't set, WP assumes `post` by default.
-		$post_types = (array) ( $query->get( 'post_type' ) ?: 'post' );
+        // Check the current post types, maybe the category archive pages
+        // are already associated with other post types.
+        //
+        // If `post_type` isn't set, WP assumes `post` by default.
+        $post_types = (array) ( $query->get( 'post_type' ) ?: 'post' );
 
-		// Add the entities post type only if the post post type is used in the query
-		// since we only want `entities` to appear alongside posts.
-		if ( in_array( 'post', $post_types ) ) {
-			$post_types[] = $this->entity_post_type_service->get_post_type();
-		}
+        // Add the entities post type only if the post post type is used in the query
+        // since we only want `entities` to appear alongside posts.
+        if ( in_array( 'post', $post_types ) ) {
+            $post_types[] = $this->entity_post_type_service->get_post_type();
+        }
 
-		// Update the query post types.
-		$query->set( 'post_type', $post_types );
+        // Update the query post types.
+        $query->set( 'post_type', $post_types );
 
-	}
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -34,7 +34,7 @@ 
 	 *
 	 * @param \Wordlift_Entity_Post_Type_Service $entity_post_type_service The {@link Wordlift_Entity_Post_Type_Service} instance.
 	 */
-	function __construct( $entity_post_type_service ) {
+	function __construct($entity_post_type_service) {
 
 		$this->entity_post_type_service = $entity_post_type_service;
 
@@ -51,10 +51,10 @@ 
 	 *
 	 * @param WP_Query $query WP's {@link WP_Query} instance.
 	 */
-	public function pre_get_posts( $query ) {
+	public function pre_get_posts($query) {
 
 		// Only for the main query, avoid problems with widgets and what not.
-		if ( ! $query->is_main_query() ) {
+		if ( ! $query->is_main_query()) {
 			return;
 		}
 
@@ -67,7 +67,7 @@ 
 		//
 		// is_admin is needed, otherwise category based post filters will show
 		// both types and at the current release (4.7) it causes PHP errors.
-		if ( is_admin() || ! is_category() || ! empty( $query->query_vars['suppress_filters'] ) ) {
+		if (is_admin() || ! is_category() || ! empty($query->query_vars['suppress_filters'])) {
 			return;
 		}
 
@@ -75,16 +75,16 @@ 
 		// are already associated with other post types.
 		//
 		// If `post_type` isn't set, WP assumes `post` by default.
-		$post_types = (array) ( $query->get( 'post_type' ) ?: 'post' );
+		$post_types = (array) ($query->get('post_type') ?: 'post');
 
 		// Add the entities post type only if the post post type is used in the query
 		// since we only want `entities` to appear alongside posts.
-		if ( in_array( 'post', $post_types ) ) {
+		if (in_array('post', $post_types)) {
 			$post_types[] = $this->entity_post_type_service->get_post_type();
 		}
 
 		// Update the query post types.
-		$query->set( 'post_type', $post_types );
+		$query->set('post_type', $post_types);
 
 	}
 

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

Indentation +317 added lines, -317 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -21,321 +21,321 @@ 
  */
 class Wordlift_Configuration_Service {
 
-	/**
-	 * The entity base path option name.
-	 *
-	 * @since 3.6.0
-	 */
-	const ENTITY_BASE_PATH_KEY = 'wl_entity_base_path';
-
-	/**
-	 * The skip wizard (admin installation wizard) option name.
-	 *
-	 * @since 3.9.0
-	 */
-	const SKIP_WIZARD = 'wl_skip_wizard';
-
-	/**
-	 * WordLift's key option name.
-	 *
-	 * @since 3.9.0
-	 */
-	const KEY = 'key';
-
-	/**
-	 * WordLift's configured language option name.
-	 *
-	 * @since 3.9.0
-	 */
-	const LANGUAGE = 'site_language';
-
-	/**
-	 * The publisher entity post ID option name.
-	 *
-	 * @since 3.9.0
-	 */
-	const PUBLISHER_ID = 'publisher_id';
-
-	/**
-	 * The dataset URI option name
-	 *
-	 * @since 3.10.0
-	 */
-	const DATASET_URI = 'redlink_dataset_uri';
-
-	/**
-	 * The Wordlift_Configuration_Service's singleton instance.
-	 *
-	 * @since  3.6.0
-	 *
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $instance Wordlift_Configuration_Service's singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Create a Wordlift_Configuration_Service's instance.
-	 *
-	 * @since 3.6.0
-	 */
-	public function __construct() {
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @return \Wordlift_Configuration_Service
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get a configuration given the option name and a key. The option value is
-	 * expected to be an array.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param string $option  The option name.
-	 * @param string $key     A key in the option value array.
-	 * @param string $default The default value in case the key is not found (by default an empty string).
-	 *
-	 * @return mixed The configuration value or the default value if not found.
-	 */
-	private function get( $option, $key, $default = '' ) {
-
-		$options = get_option( $option, array() );
-
-		return isset( $options[ $key ] ) ? $options[ $key ] : $default;
-	}
-
-	/**
-	 * Set a configuration parameter.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @param string $option Name of option to retrieve. Expected to not be SQL-escaped.
-	 * @param string $key    The value key.
-	 * @param mixed  $value  The value.
-	 */
-	private function set( $option, $key, $value ) {
-
-		$values         = get_option( $option );
-		$values         = isset( $values ) ? $values : array();
-		$values[ $key ] = $value;
-		update_option( $option, $values );
-
-	}
-
-	/**
-	 * Get the entity base path, by default 'entity'.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @return string The entity base path.
-	 */
-	public function get_entity_base_path() {
-
-		return $this->get( 'wl_general_settings', self::ENTITY_BASE_PATH_KEY, 'entity' );
-	}
-
-	/**
-	 * Get the entity base path.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @param string $value The entity base path.
-	 */
-	public function set_entity_base_path( $value ) {
-
-		$this->set( 'wl_general_settings', self::ENTITY_BASE_PATH_KEY, $value );
-	}
-
-	/**
-	 * Whether the installation skip wizard should be skipped.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @return bool True if it should be skipped otherwise false.
-	 */
-	public function is_skip_wizard() {
-
-		return $this->get( 'wl_general_settings', self::SKIP_WIZARD, false );
-	}
-
-	/**
-	 * Set the skip wizard parameter.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @param bool $value True to skip the wizard. We expect a boolean value.
-	 */
-	public function set_skip_wizard( $value ) {
-
-		$this->set( 'wl_general_settings', self::SKIP_WIZARD, $value === true );
-
-	}
-
-	/**
-	 * Get WordLift's key.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @return WordLift's key or an empty string if not set.
-	 */
-	public function get_key() {
-
-		return $this->get( 'wl_general_settings', self::KEY, '' );
-	}
-
-	/**
-	 * Set WordLift's key.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @param string $value WordLift's key.
-	 */
-	public function set_key( $value ) {
-
-		$this->set( 'wl_general_settings', self::KEY, $value );
-	}
-
-	/**
-	 * Get WordLift's configured language, by default 'en'.
-	 *
-	 * Note that WordLift's language is used when writing strings to the Linked Data dataset, not for the analysis.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @return string WordLift's configured language code ('en' by default).
-	 */
-	public function get_language_code() {
-
-		return $this->get( 'wl_general_settings', self::LANGUAGE, 'en' );
-	}
-
-	/**
-	 * Set WordLift's language code, used when storing strings to the Linked Data dataset.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @param string $value WordLift's language code.
-	 */
-	public function set_language_code( $value ) {
-
-		$this->set( 'wl_general_settings', self::LANGUAGE, $value );
-
-	}
-
-	/**
-	 * Get the publisher entity post id.
-	 *
-	 * The publisher entity post id points to an entity post which contains the data for the publisher used in schema.org
-	 * Article markup.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @return int|NULL The publisher entity post id or NULL if not set.
-	 */
-	public function get_publisher_id() {
-
-		return $this->get( 'wl_general_settings', self::PUBLISHER_ID, null );
-	}
-
-	/**
-	 * Set the publisher entity post id.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @param int $value The publisher entity post id.
-	 */
-	public function set_publisher_id( $value ) {
-
-		$this->set( 'wl_general_settings', self::PUBLISHER_ID, $value );
-
-	}
-
-	/**
-	 * Get the dataset URI.
-	 *
-	 * @since 3.10.0
-	 *
-	 * @return string The dataset URI or an empty string if not set.
-	 */
-	public function get_dataset_uri() {
-
-		return $this->get( 'wl_advanced_settings', self::DATASET_URI, null );
-	}
-
-	/**
-	 * Set the dataset URI.
-	 *
-	 * @since 3.10.0
-	 *
-	 * @param string $value The dataset URI.
-	 */
-	public function set_dataset_uri( $value ) {
-
-		$this->set( 'wl_advanced_settings', self::DATASET_URI, $value );
-	}
-
-	/**
-	 * Intercept the change of the WordLift key in order to set the dataset URI.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param array $old_value The old settings.
-	 * @param array $new_value The new settings.
-	 */
-	public function update_key( $old_value, $new_value ) {
-
-		// Check the old key value and the new one. We're going to ask for the dataset URI only if the key has changed.
-		$old_key = isset( $old_value['key'] ) ? $old_value['key'] : '';
-		$new_key = isset( $new_value['key'] ) ? $new_value['key'] : '';
-
-		// If the key hasn't changed, don't do anything.
-		// WARN The 'update_option' hook is fired only if the new and old value are not equal
-		if ( $old_key === $new_key ) {
-			return;
-		}
-
-		// If the key is empty, empty the dataset URI.
-		if ( '' === $new_key ) {
-			$this->set_dataset_uri( '' );
-		}
-
-		// Request the dataset URI.
-		$response = wp_remote_get( $this->get_accounts_by_key_dataset_uri( $new_key ), unserialize( WL_REDLINK_API_HTTP_OPTIONS ) );
-
-		// If the response is valid, then set the value.
-		if ( ! is_wp_error( $response ) && 200 === (int) $response['response']['code'] ) {
-
-			$this->set_dataset_uri( $response['body'] );
-
-		} else {
-			// TO DO User notification is needed here.
-		}
-
-	}
-
-	/**
-	 * Get the API URI to retrieve the dataset URI using the WordLift Key.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param string $key The WordLift key to use.
-	 *
-	 * @return string The API URI.
-	 */
-	public function get_accounts_by_key_dataset_uri( $key ) {
-
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "accounts/key=$key/dataset_uri";
-	}
+    /**
+     * The entity base path option name.
+     *
+     * @since 3.6.0
+     */
+    const ENTITY_BASE_PATH_KEY = 'wl_entity_base_path';
+
+    /**
+     * The skip wizard (admin installation wizard) option name.
+     *
+     * @since 3.9.0
+     */
+    const SKIP_WIZARD = 'wl_skip_wizard';
+
+    /**
+     * WordLift's key option name.
+     *
+     * @since 3.9.0
+     */
+    const KEY = 'key';
+
+    /**
+     * WordLift's configured language option name.
+     *
+     * @since 3.9.0
+     */
+    const LANGUAGE = 'site_language';
+
+    /**
+     * The publisher entity post ID option name.
+     *
+     * @since 3.9.0
+     */
+    const PUBLISHER_ID = 'publisher_id';
+
+    /**
+     * The dataset URI option name
+     *
+     * @since 3.10.0
+     */
+    const DATASET_URI = 'redlink_dataset_uri';
+
+    /**
+     * The Wordlift_Configuration_Service's singleton instance.
+     *
+     * @since  3.6.0
+     *
+     * @access private
+     * @var \Wordlift_Configuration_Service $instance Wordlift_Configuration_Service's singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * Create a Wordlift_Configuration_Service's instance.
+     *
+     * @since 3.6.0
+     */
+    public function __construct() {
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance.
+     *
+     * @since 3.6.0
+     *
+     * @return \Wordlift_Configuration_Service
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Get a configuration given the option name and a key. The option value is
+     * expected to be an array.
+     *
+     * @since 3.6.0
+     *
+     * @param string $option  The option name.
+     * @param string $key     A key in the option value array.
+     * @param string $default The default value in case the key is not found (by default an empty string).
+     *
+     * @return mixed The configuration value or the default value if not found.
+     */
+    private function get( $option, $key, $default = '' ) {
+
+        $options = get_option( $option, array() );
+
+        return isset( $options[ $key ] ) ? $options[ $key ] : $default;
+    }
+
+    /**
+     * Set a configuration parameter.
+     *
+     * @since 3.9.0
+     *
+     * @param string $option Name of option to retrieve. Expected to not be SQL-escaped.
+     * @param string $key    The value key.
+     * @param mixed  $value  The value.
+     */
+    private function set( $option, $key, $value ) {
+
+        $values         = get_option( $option );
+        $values         = isset( $values ) ? $values : array();
+        $values[ $key ] = $value;
+        update_option( $option, $values );
+
+    }
+
+    /**
+     * Get the entity base path, by default 'entity'.
+     *
+     * @since 3.6.0
+     *
+     * @return string The entity base path.
+     */
+    public function get_entity_base_path() {
+
+        return $this->get( 'wl_general_settings', self::ENTITY_BASE_PATH_KEY, 'entity' );
+    }
+
+    /**
+     * Get the entity base path.
+     *
+     * @since 3.9.0
+     *
+     * @param string $value The entity base path.
+     */
+    public function set_entity_base_path( $value ) {
+
+        $this->set( 'wl_general_settings', self::ENTITY_BASE_PATH_KEY, $value );
+    }
+
+    /**
+     * Whether the installation skip wizard should be skipped.
+     *
+     * @since 3.9.0
+     *
+     * @return bool True if it should be skipped otherwise false.
+     */
+    public function is_skip_wizard() {
+
+        return $this->get( 'wl_general_settings', self::SKIP_WIZARD, false );
+    }
+
+    /**
+     * Set the skip wizard parameter.
+     *
+     * @since 3.9.0
+     *
+     * @param bool $value True to skip the wizard. We expect a boolean value.
+     */
+    public function set_skip_wizard( $value ) {
+
+        $this->set( 'wl_general_settings', self::SKIP_WIZARD, $value === true );
+
+    }
+
+    /**
+     * Get WordLift's key.
+     *
+     * @since 3.9.0
+     *
+     * @return WordLift's key or an empty string if not set.
+     */
+    public function get_key() {
+
+        return $this->get( 'wl_general_settings', self::KEY, '' );
+    }
+
+    /**
+     * Set WordLift's key.
+     *
+     * @since 3.9.0
+     *
+     * @param string $value WordLift's key.
+     */
+    public function set_key( $value ) {
+
+        $this->set( 'wl_general_settings', self::KEY, $value );
+    }
+
+    /**
+     * Get WordLift's configured language, by default 'en'.
+     *
+     * Note that WordLift's language is used when writing strings to the Linked Data dataset, not for the analysis.
+     *
+     * @since 3.9.0
+     *
+     * @return string WordLift's configured language code ('en' by default).
+     */
+    public function get_language_code() {
+
+        return $this->get( 'wl_general_settings', self::LANGUAGE, 'en' );
+    }
+
+    /**
+     * Set WordLift's language code, used when storing strings to the Linked Data dataset.
+     *
+     * @since 3.9.0
+     *
+     * @param string $value WordLift's language code.
+     */
+    public function set_language_code( $value ) {
+
+        $this->set( 'wl_general_settings', self::LANGUAGE, $value );
+
+    }
+
+    /**
+     * Get the publisher entity post id.
+     *
+     * The publisher entity post id points to an entity post which contains the data for the publisher used in schema.org
+     * Article markup.
+     *
+     * @since 3.9.0
+     *
+     * @return int|NULL The publisher entity post id or NULL if not set.
+     */
+    public function get_publisher_id() {
+
+        return $this->get( 'wl_general_settings', self::PUBLISHER_ID, null );
+    }
+
+    /**
+     * Set the publisher entity post id.
+     *
+     * @since 3.9.0
+     *
+     * @param int $value The publisher entity post id.
+     */
+    public function set_publisher_id( $value ) {
+
+        $this->set( 'wl_general_settings', self::PUBLISHER_ID, $value );
+
+    }
+
+    /**
+     * Get the dataset URI.
+     *
+     * @since 3.10.0
+     *
+     * @return string The dataset URI or an empty string if not set.
+     */
+    public function get_dataset_uri() {
+
+        return $this->get( 'wl_advanced_settings', self::DATASET_URI, null );
+    }
+
+    /**
+     * Set the dataset URI.
+     *
+     * @since 3.10.0
+     *
+     * @param string $value The dataset URI.
+     */
+    public function set_dataset_uri( $value ) {
+
+        $this->set( 'wl_advanced_settings', self::DATASET_URI, $value );
+    }
+
+    /**
+     * Intercept the change of the WordLift key in order to set the dataset URI.
+     *
+     * @since 3.11.0
+     *
+     * @param array $old_value The old settings.
+     * @param array $new_value The new settings.
+     */
+    public function update_key( $old_value, $new_value ) {
+
+        // Check the old key value and the new one. We're going to ask for the dataset URI only if the key has changed.
+        $old_key = isset( $old_value['key'] ) ? $old_value['key'] : '';
+        $new_key = isset( $new_value['key'] ) ? $new_value['key'] : '';
+
+        // If the key hasn't changed, don't do anything.
+        // WARN The 'update_option' hook is fired only if the new and old value are not equal
+        if ( $old_key === $new_key ) {
+            return;
+        }
+
+        // If the key is empty, empty the dataset URI.
+        if ( '' === $new_key ) {
+            $this->set_dataset_uri( '' );
+        }
+
+        // Request the dataset URI.
+        $response = wp_remote_get( $this->get_accounts_by_key_dataset_uri( $new_key ), unserialize( WL_REDLINK_API_HTTP_OPTIONS ) );
+
+        // If the response is valid, then set the value.
+        if ( ! is_wp_error( $response ) && 200 === (int) $response['response']['code'] ) {
+
+            $this->set_dataset_uri( $response['body'] );
+
+        } else {
+            // TO DO User notification is needed here.
+        }
+
+    }
+
+    /**
+     * Get the API URI to retrieve the dataset URI using the WordLift Key.
+     *
+     * @since 3.11.0
+     *
+     * @param string $key The WordLift key to use.
+     *
+     * @return string The API URI.
+     */
+    public function get_accounts_by_key_dataset_uri( $key ) {
+
+        return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "accounts/key=$key/dataset_uri";
+    }
 
 }

Spacing +38 added lines, -38 removed lines

@@ -10,7 +10,7 @@ 
  * @since      3.6.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -108,11 +108,11 @@ 
 	 *
 	 * @return mixed The configuration value or the default value if not found.
 	 */
-	private function get( $option, $key, $default = '' ) {
+	private function get($option, $key, $default = '') {
 
-		$options = get_option( $option, array() );
+		$options = get_option($option, array());
 
-		return isset( $options[ $key ] ) ? $options[ $key ] : $default;
+		return isset($options[$key]) ? $options[$key] : $default;
 	}
 
 	/**
@@ -124,12 +124,12 @@ 
 	 * @param string $key    The value key.
 	 * @param mixed  $value  The value.
 	 */
-	private function set( $option, $key, $value ) {
+	private function set($option, $key, $value) {
 
-		$values         = get_option( $option );
-		$values         = isset( $values ) ? $values : array();
-		$values[ $key ] = $value;
-		update_option( $option, $values );
+		$values         = get_option($option);
+		$values         = isset($values) ? $values : array();
+		$values[$key] = $value;
+		update_option($option, $values);
 
 	}
 
@@ -142,7 +142,7 @@ 
 	 */
 	public function get_entity_base_path() {
 
-		return $this->get( 'wl_general_settings', self::ENTITY_BASE_PATH_KEY, 'entity' );
+		return $this->get('wl_general_settings', self::ENTITY_BASE_PATH_KEY, 'entity');
 	}
 
 	/**
@@ -152,9 +152,9 @@ 
 	 *
 	 * @param string $value The entity base path.
 	 */
-	public function set_entity_base_path( $value ) {
+	public function set_entity_base_path($value) {
 
-		$this->set( 'wl_general_settings', self::ENTITY_BASE_PATH_KEY, $value );
+		$this->set('wl_general_settings', self::ENTITY_BASE_PATH_KEY, $value);
 	}
 
 	/**
@@ -166,7 +166,7 @@ 
 	 */
 	public function is_skip_wizard() {
 
-		return $this->get( 'wl_general_settings', self::SKIP_WIZARD, false );
+		return $this->get('wl_general_settings', self::SKIP_WIZARD, false);
 	}
 
 	/**
@@ -176,9 +176,9 @@ 
 	 *
 	 * @param bool $value True to skip the wizard. We expect a boolean value.
 	 */
-	public function set_skip_wizard( $value ) {
+	public function set_skip_wizard($value) {
 
-		$this->set( 'wl_general_settings', self::SKIP_WIZARD, $value === true );
+		$this->set('wl_general_settings', self::SKIP_WIZARD, $value === true);
 
 	}
 
@@ -191,7 +191,7 @@ 
 	 */
 	public function get_key() {
 
-		return $this->get( 'wl_general_settings', self::KEY, '' );
+		return $this->get('wl_general_settings', self::KEY, '');
 	}
 
 	/**
@@ -201,9 +201,9 @@ 
 	 *
 	 * @param string $value WordLift's key.
 	 */
-	public function set_key( $value ) {
+	public function set_key($value) {
 
-		$this->set( 'wl_general_settings', self::KEY, $value );
+		$this->set('wl_general_settings', self::KEY, $value);
 	}
 
 	/**
@@ -217,7 +217,7 @@ 
 	 */
 	public function get_language_code() {
 
-		return $this->get( 'wl_general_settings', self::LANGUAGE, 'en' );
+		return $this->get('wl_general_settings', self::LANGUAGE, 'en');
 	}
 
 	/**
@@ -227,9 +227,9 @@ 
 	 *
 	 * @param string $value WordLift's language code.
 	 */
-	public function set_language_code( $value ) {
+	public function set_language_code($value) {
 
-		$this->set( 'wl_general_settings', self::LANGUAGE, $value );
+		$this->set('wl_general_settings', self::LANGUAGE, $value);
 
 	}
 
@@ -245,7 +245,7 @@ 
 	 */
 	public function get_publisher_id() {
 
-		return $this->get( 'wl_general_settings', self::PUBLISHER_ID, null );
+		return $this->get('wl_general_settings', self::PUBLISHER_ID, null);
 	}
 
 	/**
@@ -255,9 +255,9 @@ 
 	 *
 	 * @param int $value The publisher entity post id.
 	 */
-	public function set_publisher_id( $value ) {
+	public function set_publisher_id($value) {
 
-		$this->set( 'wl_general_settings', self::PUBLISHER_ID, $value );
+		$this->set('wl_general_settings', self::PUBLISHER_ID, $value);
 
 	}
 
@@ -270,7 +270,7 @@ 
 	 */
 	public function get_dataset_uri() {
 
-		return $this->get( 'wl_advanced_settings', self::DATASET_URI, null );
+		return $this->get('wl_advanced_settings', self::DATASET_URI, null);
 	}
 
 	/**
@@ -280,9 +280,9 @@ 
 	 *
 	 * @param string $value The dataset URI.
 	 */
-	public function set_dataset_uri( $value ) {
+	public function set_dataset_uri($value) {
 
-		$this->set( 'wl_advanced_settings', self::DATASET_URI, $value );
+		$this->set('wl_advanced_settings', self::DATASET_URI, $value);
 	}
 
 	/**
@@ -293,30 +293,30 @@ 
 	 * @param array $old_value The old settings.
 	 * @param array $new_value The new settings.
 	 */
-	public function update_key( $old_value, $new_value ) {
+	public function update_key($old_value, $new_value) {
 
 		// Check the old key value and the new one. We're going to ask for the dataset URI only if the key has changed.
-		$old_key = isset( $old_value['key'] ) ? $old_value['key'] : '';
-		$new_key = isset( $new_value['key'] ) ? $new_value['key'] : '';
+		$old_key = isset($old_value['key']) ? $old_value['key'] : '';
+		$new_key = isset($new_value['key']) ? $new_value['key'] : '';
 
 		// If the key hasn't changed, don't do anything.
 		// WARN The 'update_option' hook is fired only if the new and old value are not equal
-		if ( $old_key === $new_key ) {
+		if ($old_key === $new_key) {
 			return;
 		}
 
 		// If the key is empty, empty the dataset URI.
-		if ( '' === $new_key ) {
-			$this->set_dataset_uri( '' );
+		if ('' === $new_key) {
+			$this->set_dataset_uri('');
 		}
 
 		// Request the dataset URI.
-		$response = wp_remote_get( $this->get_accounts_by_key_dataset_uri( $new_key ), unserialize( WL_REDLINK_API_HTTP_OPTIONS ) );
+		$response = wp_remote_get($this->get_accounts_by_key_dataset_uri($new_key), unserialize(WL_REDLINK_API_HTTP_OPTIONS));
 
 		// If the response is valid, then set the value.
-		if ( ! is_wp_error( $response ) && 200 === (int) $response['response']['code'] ) {
+		if ( ! is_wp_error($response) && 200 === (int) $response['response']['code']) {
 
-			$this->set_dataset_uri( $response['body'] );
+			$this->set_dataset_uri($response['body']);
 
 		} else {
 			// TO DO User notification is needed here.
@@ -333,9 +333,9 @@ 
 	 *
 	 * @return string The API URI.
 	 */
-	public function get_accounts_by_key_dataset_uri( $key ) {
+	public function get_accounts_by_key_dataset_uri($key) {
 
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "accounts/key=$key/dataset_uri";
+		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE."accounts/key=$key/dataset_uri";
 	}
 
 }