insideout10 / wordlift-plugin

src/public/class-wordlift-related-entities-cloud-widget.php

Indentation +53 added lines, -53 removed lines

@@ -16,33 +16,33 @@ 
  */
 class Wordlift_Related_Entities_Cloud_Widget extends Wordlift_Widget {
 
-	/**
-	 * Create an {@link Wordlift_Related_Entities_Cloud_Widget} instance.
-	 *
-	 * @since 3.11.0
-	 */
-	public function __construct() {
-		parent::__construct(
-			'wl_related_entities_cloud',
-			__( 'WordLift Entities Cloud', 'wordlift' ),
-			array(
-				'classname'   => 'wl_related_entities_cloud',
-				'description' => __( 'Display entities related to the current post/entity in a tag cloud.', 'wordlift' ),
-			)
-		);
-
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function form( $instance ) {
-		$title_id          = $this->get_field_id( 'title' );
-		$instance['title'] = ! empty( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
-		?>
+    /**
+     * Create an {@link Wordlift_Related_Entities_Cloud_Widget} instance.
+     *
+     * @since 3.11.0
+     */
+    public function __construct() {
+        parent::__construct(
+            'wl_related_entities_cloud',
+            __( 'WordLift Entities Cloud', 'wordlift' ),
+            array(
+                'classname'   => 'wl_related_entities_cloud',
+                'description' => __( 'Display entities related to the current post/entity in a tag cloud.', 'wordlift' ),
+            )
+        );
+
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function form( $instance ) {
+        $title_id          = $this->get_field_id( 'title' );
+        $instance['title'] = ! empty( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
+        ?>
 
 		<p><label for="<?php echo esc_attr( $title_id ); ?>"><?php
-				esc_html_e( 'Title:' ); ?></label>
+                esc_html_e( 'Title:' ); ?></label>
 			<input type="text" class="widefat"
 			       id="<?php echo esc_attr( $title_id ); ?>"
 			       name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>"
@@ -51,46 +51,46 @@ 
 
 		<?php
 
-		return 'wl_related_entities_cloud_form';
-	}
+        return 'wl_related_entities_cloud_form';
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function update( $new_instance, $old_instance ) {
+    /**
+     * @inheritdoc
+     */
+    public function update( $new_instance, $old_instance ) {
 
-		return array( 'title' => sanitize_text_field( $new_instance['title'] ) );
-	}
+        return array( 'title' => sanitize_text_field( $new_instance['title'] ) );
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function widget( $args, $instance ) {
+    /**
+     * @inheritdoc
+     */
+    public function widget( $args, $instance ) {
 
-		/*
+        /*
 		 * Use the shortcode to calculate the HTML required to show the cloud
 		 * if there is no such html do not render the widget at all.
 		 */
-		$cloud_html = do_shortcode( '[wl_cloud]' );
-		if ( empty( $cloud_html ) ) {
-			return false;
-		}
+        $cloud_html = do_shortcode( '[wl_cloud]' );
+        if ( empty( $cloud_html ) ) {
+            return false;
+        }
 
-		// The widget title.
-		$title = empty( $instance['title'] ) ? __( 'Related Entities', 'wordlift' ) : $instance['title'];
+        // The widget title.
+        $title = empty( $instance['title'] ) ? __( 'Related Entities', 'wordlift' ) : $instance['title'];
 
-		// Standard filter all widgets should apply
-		$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
+        // Standard filter all widgets should apply
+        $title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
 
-		echo $args['before_widget'];
+        echo $args['before_widget'];
 
-		if ( $title ) {
-			echo $args['before_title'] . $title . $args['after_title'];
-		}
+        if ( $title ) {
+            echo $args['before_title'] . $title . $args['after_title'];
+        }
 
-		echo $cloud_html;
-		echo $args['after_widget'];
+        echo $cloud_html;
+        echo $args['after_widget'];
 
-	}
+    }
 
 }

Spacing +19 added lines, -19 removed lines

@@ -24,10 +24,10 @@ 
 	public function __construct() {
 		parent::__construct(
 			'wl_related_entities_cloud',
-			__( 'WordLift Entities Cloud', 'wordlift' ),
+			__('WordLift Entities Cloud', 'wordlift'),
 			array(
 				'classname'   => 'wl_related_entities_cloud',
-				'description' => __( 'Display entities related to the current post/entity in a tag cloud.', 'wordlift' ),
+				'description' => __('Display entities related to the current post/entity in a tag cloud.', 'wordlift'),
 			)
 		);
 
@@ -36,17 +36,17 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function form( $instance ) {
-		$title_id          = $this->get_field_id( 'title' );
-		$instance['title'] = ! empty( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
+	public function form($instance) {
+		$title_id          = $this->get_field_id('title');
+		$instance['title'] = ! empty($instance['title']) ? esc_attr($instance['title']) : '';
 		?>
 
-		<p><label for="<?php echo esc_attr( $title_id ); ?>"><?php
-				esc_html_e( 'Title:' ); ?></label>
+		<p><label for="<?php echo esc_attr($title_id); ?>"><?php
+				esc_html_e('Title:'); ?></label>
 			<input type="text" class="widefat"
-			       id="<?php echo esc_attr( $title_id ); ?>"
-			       name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>"
-			       value="<?php echo esc_attr( $instance['title'] ); ?>" />
+			       id="<?php echo esc_attr($title_id); ?>"
+			       name="<?php echo esc_attr($this->get_field_name('title')); ?>"
+			       value="<?php echo esc_attr($instance['title']); ?>" />
 		</p>
 
 		<?php
@@ -57,35 +57,35 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 
-		return array( 'title' => sanitize_text_field( $new_instance['title'] ) );
+		return array('title' => sanitize_text_field($new_instance['title']));
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 
 		/*
 		 * Use the shortcode to calculate the HTML required to show the cloud
 		 * if there is no such html do not render the widget at all.
 		 */
-		$cloud_html = do_shortcode( '[wl_cloud]' );
-		if ( empty( $cloud_html ) ) {
+		$cloud_html = do_shortcode('[wl_cloud]');
+		if (empty($cloud_html)) {
 			return false;
 		}
 
 		// The widget title.
-		$title = empty( $instance['title'] ) ? __( 'Related Entities', 'wordlift' ) : $instance['title'];
+		$title = empty($instance['title']) ? __('Related Entities', 'wordlift') : $instance['title'];
 
 		// Standard filter all widgets should apply
-		$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
+		$title = apply_filters('widget_title', $title, $instance, $this->id_base);
 
 		echo $args['before_widget'];
 
-		if ( $title ) {
-			echo $args['before_title'] . $title . $args['after_title'];
+		if ($title) {
+			echo $args['before_title'].$title.$args['after_title'];
 		}
 
 		echo $cloud_html;

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

Indentation +169 added lines, -169 removed lines

@@ -7,174 +7,174 @@
  */
 class Wordlift_Topic_Taxonomy_Service {
 
-	/**
-	 * The Log service.
-	 *
-	 * @since 3.5.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log_service The Log service.
-	 */
-	private $log_service;
-
-	/**
-	 * Taxonomy name.
-	 *
-	 * @since 3.5.0
-	 */
-	const TAXONOMY_NAME = 'wl_topic';
-
-	/**
-	 * Taxonomy object type.
-	 *
-	 * @since 3.5.0
-	 */
-	const TAXONOMY_OBJECT_TYPE = 'post';
-
-	/**
-	 * Taxonomy slug.
-	 *
-	 * @since 3.5.0
-	 */
-	const TAXONOMY_SLUG = 'wl_topic';
-
-	/**
-	 * A singleton instance of the Wordlift_Topic_Taxonomy_Service service.
-	 *
-	 * @since 3.5.0
-	 * @access private
-	 * @var \Wordlift_Topic_Taxonomy_Service $instance A singleton instance of Wordlift_Topic_Taxonomy_Service.
-	 */
-	private static $instance;
-
-	/**
-	 * Create a Wordlift_Topic_Taxonomy_Service instance.
-	 *
-	 * @since 3.5.0
-	 *
-	 */
-	public function __construct() {
-
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
-
-		// Set the singleton instance.
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance of the Entity service.
-	 *
-	 * @since 3.5.0
-	 * @return Wordlift_Topic_Taxonomy_Service
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Just register the topic taxonomy.
-	 *
-	 * @since 3.5.0
-	 *
-	 */
-	public function init() {
-
-		// See https://codex.wordpress.org/Function_Reference/register_taxonomy
-		$labels = array(
-			'name'              => _x( 'Topics', 'taxonomy general name', 'wordlift' ),
-			'singular_name'     => _x( 'Topic', 'taxonomy singular name', 'wordlift' ),
-			'search_items'      => __( 'Search Topics', 'wordlift' ),
-			'all_items'         => __( 'All Topics', 'wordlift' ),
-			'parent_item'       => __( 'Parent Topic', 'wordlift' ),
-			'parent_item_colon' => __( 'Parent Topic:', 'wordlift' ),
-			'edit_item'         => __( 'Edit Topic', 'wordlift' ),
-			'update_item'       => __( 'Update Topic', 'wordlift' ),
-			'add_new_item'      => __( 'Add New Topic', 'wordlift' ),
-			'new_item_name'     => __( 'New Topic', 'wordlift' ),
-			'menu_name'         => __( 'Topics', 'wordlift' ),
-		);
-
-		$capabilities = array(
-			'manage_terms' => null,
-			'edit_terms'   => null,
-			'delete_terms' => null,
-			'assign_terms' => 'edit_posts',
-		);
-
-		$args = array(
-			'labels'            => $labels,
-			'capabilities'      => $capabilities,
-			'hierarchical'      => true,
-			'show_admin_column' => false,
-			'show_ui'			=> false,
-			'rewrite'			=> array(
-				'slug'	=> self::TAXONOMY_SLUG,
-			),
-		);
-
-		// Register taxonomy
-		register_taxonomy(
-			self::TAXONOMY_NAME, self::TAXONOMY_OBJECT_TYPE, $args
-		);
-
-	}
-
-	/**
-	 * Get or create a taxonomy term from a given entity topic.
-	 *
-	 * @since 3.5.0
-	 *
-	 */
-	public function get_or_create_term_from_topic_entity( $topic ) {
-
-		// Define taxonomy term slug
-		$term_slug = sanitize_title( $topic->post_title );
-		// Look for an existing taxonomy term with a given slug
-		if ( $term = get_term_by( 'slug', $term_slug, self::TAXONOMY_NAME ) ) {
-			return (int) $term->term_id;
-		}
-		// Otherwise create a new term and return it
-		$result = wp_insert_term(
-			$topic->post_title,
-			self::TAXONOMY_NAME,
-			array(
-				'slug'			=> $term_slug,
-				'description'	=> $topic->post_content,
-			)
-		);
-
-		return  (int) $result['term_id'];
-	}
-
-	/**
-	 * Set a topic for a given post.
-	 *
-	 * @since 3.5.0
-	 *
-	 */
-	public function set_topic_for( $post_id, $topic_id ) {
-		// Retrieve the topic entity post
-		$topic_entity_post = get_post( $topic_id );
-		// If current topic does not exist in db false is returned
-		if ( null === $topic_entity_post ) {
-			return false;
-		}
-		// Create the proper taxonomy term if needed
-		$term_id = $this->get_or_create_term_from_topic_entity( $topic_entity_post );
-		// Link the term to the current post
-		wp_set_post_terms( $post_id, $term_id, self::TAXONOMY_NAME, false );
-		return true;
-	}
-
-	/**
-	 * Unlink any topic for a given post.
-	 *
-	 * @since 3.5.0
-	 *
-	 */
-	public function unlink_topic_for( $post_id ) {
-		wp_delete_object_term_relationships( $post_id, self::TAXONOMY_NAME );
-	}
+    /**
+     * The Log service.
+     *
+     * @since 3.5.0
+     * @access private
+     * @var \Wordlift_Log_Service $log_service The Log service.
+     */
+    private $log_service;
+
+    /**
+     * Taxonomy name.
+     *
+     * @since 3.5.0
+     */
+    const TAXONOMY_NAME = 'wl_topic';
+
+    /**
+     * Taxonomy object type.
+     *
+     * @since 3.5.0
+     */
+    const TAXONOMY_OBJECT_TYPE = 'post';
+
+    /**
+     * Taxonomy slug.
+     *
+     * @since 3.5.0
+     */
+    const TAXONOMY_SLUG = 'wl_topic';
+
+    /**
+     * A singleton instance of the Wordlift_Topic_Taxonomy_Service service.
+     *
+     * @since 3.5.0
+     * @access private
+     * @var \Wordlift_Topic_Taxonomy_Service $instance A singleton instance of Wordlift_Topic_Taxonomy_Service.
+     */
+    private static $instance;
+
+    /**
+     * Create a Wordlift_Topic_Taxonomy_Service instance.
+     *
+     * @since 3.5.0
+     *
+     */
+    public function __construct() {
+
+        $this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
+
+        // Set the singleton instance.
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance of the Entity service.
+     *
+     * @since 3.5.0
+     * @return Wordlift_Topic_Taxonomy_Service
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Just register the topic taxonomy.
+     *
+     * @since 3.5.0
+     *
+     */
+    public function init() {
+
+        // See https://codex.wordpress.org/Function_Reference/register_taxonomy
+        $labels = array(
+            'name'              => _x( 'Topics', 'taxonomy general name', 'wordlift' ),
+            'singular_name'     => _x( 'Topic', 'taxonomy singular name', 'wordlift' ),
+            'search_items'      => __( 'Search Topics', 'wordlift' ),
+            'all_items'         => __( 'All Topics', 'wordlift' ),
+            'parent_item'       => __( 'Parent Topic', 'wordlift' ),
+            'parent_item_colon' => __( 'Parent Topic:', 'wordlift' ),
+            'edit_item'         => __( 'Edit Topic', 'wordlift' ),
+            'update_item'       => __( 'Update Topic', 'wordlift' ),
+            'add_new_item'      => __( 'Add New Topic', 'wordlift' ),
+            'new_item_name'     => __( 'New Topic', 'wordlift' ),
+            'menu_name'         => __( 'Topics', 'wordlift' ),
+        );
+
+        $capabilities = array(
+            'manage_terms' => null,
+            'edit_terms'   => null,
+            'delete_terms' => null,
+            'assign_terms' => 'edit_posts',
+        );
+
+        $args = array(
+            'labels'            => $labels,
+            'capabilities'      => $capabilities,
+            'hierarchical'      => true,
+            'show_admin_column' => false,
+            'show_ui'			=> false,
+            'rewrite'			=> array(
+                'slug'	=> self::TAXONOMY_SLUG,
+            ),
+        );
+
+        // Register taxonomy
+        register_taxonomy(
+            self::TAXONOMY_NAME, self::TAXONOMY_OBJECT_TYPE, $args
+        );
+
+    }
+
+    /**
+     * Get or create a taxonomy term from a given entity topic.
+     *
+     * @since 3.5.0
+     *
+     */
+    public function get_or_create_term_from_topic_entity( $topic ) {
+
+        // Define taxonomy term slug
+        $term_slug = sanitize_title( $topic->post_title );
+        // Look for an existing taxonomy term with a given slug
+        if ( $term = get_term_by( 'slug', $term_slug, self::TAXONOMY_NAME ) ) {
+            return (int) $term->term_id;
+        }
+        // Otherwise create a new term and return it
+        $result = wp_insert_term(
+            $topic->post_title,
+            self::TAXONOMY_NAME,
+            array(
+                'slug'			=> $term_slug,
+                'description'	=> $topic->post_content,
+            )
+        );
+
+        return  (int) $result['term_id'];
+    }
+
+    /**
+     * Set a topic for a given post.
+     *
+     * @since 3.5.0
+     *
+     */
+    public function set_topic_for( $post_id, $topic_id ) {
+        // Retrieve the topic entity post
+        $topic_entity_post = get_post( $topic_id );
+        // If current topic does not exist in db false is returned
+        if ( null === $topic_entity_post ) {
+            return false;
+        }
+        // Create the proper taxonomy term if needed
+        $term_id = $this->get_or_create_term_from_topic_entity( $topic_entity_post );
+        // Link the term to the current post
+        wp_set_post_terms( $post_id, $term_id, self::TAXONOMY_NAME, false );
+        return true;
+    }
+
+    /**
+     * Unlink any topic for a given post.
+     *
+     * @since 3.5.0
+     *
+     */
+    public function unlink_topic_for( $post_id ) {
+        wp_delete_object_term_relationships( $post_id, self::TAXONOMY_NAME );
+    }
 
 }

Spacing +22 added lines, -22 removed lines

@@ -54,7 +54,7 @@ 
 	 */
 	public function __construct() {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_Entity_Service');
 
 		// Set the singleton instance.
 		self::$instance = $this;
@@ -82,17 +82,17 @@ 
 
 		// See https://codex.wordpress.org/Function_Reference/register_taxonomy
 		$labels = array(
-			'name'              => _x( 'Topics', 'taxonomy general name', 'wordlift' ),
-			'singular_name'     => _x( 'Topic', 'taxonomy singular name', 'wordlift' ),
-			'search_items'      => __( 'Search Topics', 'wordlift' ),
-			'all_items'         => __( 'All Topics', 'wordlift' ),
-			'parent_item'       => __( 'Parent Topic', 'wordlift' ),
-			'parent_item_colon' => __( 'Parent Topic:', 'wordlift' ),
-			'edit_item'         => __( 'Edit Topic', 'wordlift' ),
-			'update_item'       => __( 'Update Topic', 'wordlift' ),
-			'add_new_item'      => __( 'Add New Topic', 'wordlift' ),
-			'new_item_name'     => __( 'New Topic', 'wordlift' ),
-			'menu_name'         => __( 'Topics', 'wordlift' ),
+			'name'              => _x('Topics', 'taxonomy general name', 'wordlift'),
+			'singular_name'     => _x('Topic', 'taxonomy singular name', 'wordlift'),
+			'search_items'      => __('Search Topics', 'wordlift'),
+			'all_items'         => __('All Topics', 'wordlift'),
+			'parent_item'       => __('Parent Topic', 'wordlift'),
+			'parent_item_colon' => __('Parent Topic:', 'wordlift'),
+			'edit_item'         => __('Edit Topic', 'wordlift'),
+			'update_item'       => __('Update Topic', 'wordlift'),
+			'add_new_item'      => __('Add New Topic', 'wordlift'),
+			'new_item_name'     => __('New Topic', 'wordlift'),
+			'menu_name'         => __('Topics', 'wordlift'),
 		);
 
 		$capabilities = array(
@@ -126,12 +126,12 @@ 
 	 * @since 3.5.0
 	 *
 	 */
-	public function get_or_create_term_from_topic_entity( $topic ) {
+	public function get_or_create_term_from_topic_entity($topic) {
 
 		// Define taxonomy term slug
-		$term_slug = sanitize_title( $topic->post_title );
+		$term_slug = sanitize_title($topic->post_title);
 		// Look for an existing taxonomy term with a given slug
-		if ( $term = get_term_by( 'slug', $term_slug, self::TAXONOMY_NAME ) ) {
+		if ($term = get_term_by('slug', $term_slug, self::TAXONOMY_NAME)) {
 			return (int) $term->term_id;
 		}
 		// Otherwise create a new term and return it
@@ -153,17 +153,17 @@ 
 	 * @since 3.5.0
 	 *
 	 */
-	public function set_topic_for( $post_id, $topic_id ) {
+	public function set_topic_for($post_id, $topic_id) {
 		// Retrieve the topic entity post
-		$topic_entity_post = get_post( $topic_id );
+		$topic_entity_post = get_post($topic_id);
 		// If current topic does not exist in db false is returned
-		if ( null === $topic_entity_post ) {
+		if (null === $topic_entity_post) {
 			return false;
 		}
 		// Create the proper taxonomy term if needed
-		$term_id = $this->get_or_create_term_from_topic_entity( $topic_entity_post );
+		$term_id = $this->get_or_create_term_from_topic_entity($topic_entity_post);
 		// Link the term to the current post
-		wp_set_post_terms( $post_id, $term_id, self::TAXONOMY_NAME, false );
+		wp_set_post_terms($post_id, $term_id, self::TAXONOMY_NAME, false);
 		return true;
 	}
 
@@ -173,8 +173,8 @@ 
 	 * @since 3.5.0
 	 *
 	 */
-	public function unlink_topic_for( $post_id ) {
-		wp_delete_object_term_relationships( $post_id, self::TAXONOMY_NAME );
+	public function unlink_topic_for($post_id) {
+		wp_delete_object_term_relationships($post_id, self::TAXONOMY_NAME);
 	}
 
 }

src/includes/class-wordlift-newrelic-adapter.php

Indentation +13 added lines, -13 removed lines

@@ -16,20 +16,20 @@
  */
 class Wordlift_NewRelic_Adapter {
 
-	/**
-	 * Tell NewRelic to ignore this "transaction" for the Apdex.
-	 *
-	 * @see   https://github.com/insideout10/wordlift-plugin/issues/521
-	 *
-	 * @since 3.11.3
-	 */
-	static function ignore_apdex() {
+    /**
+     * Tell NewRelic to ignore this "transaction" for the Apdex.
+     *
+     * @see   https://github.com/insideout10/wordlift-plugin/issues/521
+     *
+     * @since 3.11.3
+     */
+    static function ignore_apdex() {
 
-		// Ensure PHP agent and the function are available.
-		if ( extension_loaded( 'newrelic' ) && function_exists( 'newrelic_ignore_apdex' ) ) {
-			newrelic_ignore_apdex();
-		}
+        // Ensure PHP agent and the function are available.
+        if ( extension_loaded( 'newrelic' ) && function_exists( 'newrelic_ignore_apdex' ) ) {
+            newrelic_ignore_apdex();
+        }
 
-	}
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 	static function ignore_apdex() {
 
 		// Ensure PHP agent and the function are available.
-		if ( extension_loaded( 'newrelic' ) && function_exists( 'newrelic_ignore_apdex' ) ) {
+		if (extension_loaded('newrelic') && function_exists('newrelic_ignore_apdex')) {
 			newrelic_ignore_apdex();
 		}
 

src/admin/class-wordlift-admin-entity-taxonomy-list-page.php

Indentation +109 added lines, -109 removed lines

@@ -13,7 +13,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -28,113 +28,113 @@ 
  */
 class Wordlift_Admin_Entity_Taxonomy_List_Page {
 
-	/**
-	 * Hook to `wl_entity_type_row_actions` to add an "action" link to Thread
-	 * SEO related settings for the term.
-	 *
-	 * @see   https://developer.wordpress.org/reference/hooks/taxonomy_row_actions/
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param array  $actions An array of action links to be displayed. Default
-	 *                        'Edit', 'Quick Edit', 'Delete', and 'View'.
-	 * @param object $term    Term object.
-	 *
-	 * @return array  $actions An array of action links to be displayed. Default
-	 *                        'Edit', 'Quick Edit', 'Delete', and 'View'.
-	 */
-	function wl_entity_type_row_actions( $actions, $term ) {
-
-		$url               = admin_url( "admin.php?page=wl_entity_type_settings&tag_ID=$term->term_id" );
-		$actions['wl-seo'] = '<a href="' . esc_url( $url ) . '">' . __( 'SEO Settings', 'wordlift' ) . '</a>';
-
-		// Hacks for pre 4.7 compatibility:
-		// * remove the quick edit.
-		unset( $actions['inline hide-if-no-js'] );
-		// * remove the edit link.
-		unset( $actions['edit'] );
-
-		return $actions;
-	}
-
-	/**
-	 * Override the capabilities related to managing the entity type terms
-	 * for multisite super admin to prevent it from manipulating it in any
-	 * way.
-	 *
-	 * @since 3.12.0
-	 *
-	 * @param array  $caps    The user's current capabilities.
-	 * @param string $cap     Capability name.
-	 * @param int    $user_id The user ID.
-	 * @param array  $args    Adds the context to the cap. Typically the object ID.
-	 *
-	 * @return array    Array containing the do_not_allow capability for super admin
-	 *                  when editing and deleting entity type terms capabilities
-	 *                    are being "approved"
-	 */
-	function restrict_super_admin( $caps, $cap, $user_id, $args ) {
-
-		switch ( $cap ) {
-			case 'wl_entity_type_edit_term':
-			case 'wl_entity_type_delete_term':
-				$caps[] = 'do_not_allow';
-		}
-
-		return $caps;
-	}
-
-	/**
-	 * Override the capabilities related to managing the entity type terms
-	 * required for WordPress < 4.7 to get access to the admin page.
-	 *
-	 * Before 4.7, WordPress checks whether the user has permission to access
-	 * the `edit-tags.php` page. So we need to provide temporary the permission
-	 * otherwise the user will get an `access not allowed` when trying to access
-	 * the page.
-	 *
-	 * @see   https://github.com/insideout10/wordlift-plugin/issues/512
-	 *
-	 * @since 3.12.0
-	 *
-	 * @param array  $caps    The user's current capabilities.
-	 * @param string $cap     Capability name.
-	 * @param int    $user_id The user ID.
-	 * @param array  $args    Adds the context to the cap. Typically the object ID.
-	 *
-	 * @return array    Array containing the manage_options capability
-	 */
-	function enable_admin_access_pre_47( $caps, $cap, $user_id, $args ) {
-
-		// Bail out if we're not dealing with the `wl_entity_type_edit_term`
-		// capability.
-		if ( 'wl_entity_type_edit_term' !== $cap ) {
-			return $caps;
-		}
-
-		$path = parse_url( $_SERVER['REQUEST_URI'], PHP_URL_PATH );
-
-		// Bail out if the `path` cannot be determined.
-		if ( null === $path ) {
-			return $caps;
-		}
-
-		// Bail out if a specific term is being handled.
-		if ( isset( $_REQUEST['action'] ) ) {
-			return $caps;
-		}
-
-		// Split the path and check if the page is the `edit-tags.php`. We can't
-		// use WP's own function because this is called very early.
-		$components = explode( '/', $path );
-		if ( 'edit-tags.php' !== $components[ count( $components ) - 1 ] ) {
-			return $caps;
-		}
-
-		// Give permission to the user.
-		$mapped[] = 'manage_options';
-
-		return $mapped;
-	}
+    /**
+     * Hook to `wl_entity_type_row_actions` to add an "action" link to Thread
+     * SEO related settings for the term.
+     *
+     * @see   https://developer.wordpress.org/reference/hooks/taxonomy_row_actions/
+     *
+     * @since 3.11.0
+     *
+     * @param array  $actions An array of action links to be displayed. Default
+     *                        'Edit', 'Quick Edit', 'Delete', and 'View'.
+     * @param object $term    Term object.
+     *
+     * @return array  $actions An array of action links to be displayed. Default
+     *                        'Edit', 'Quick Edit', 'Delete', and 'View'.
+     */
+    function wl_entity_type_row_actions( $actions, $term ) {
+
+        $url               = admin_url( "admin.php?page=wl_entity_type_settings&tag_ID=$term->term_id" );
+        $actions['wl-seo'] = '<a href="' . esc_url( $url ) . '">' . __( 'SEO Settings', 'wordlift' ) . '</a>';
+
+        // Hacks for pre 4.7 compatibility:
+        // * remove the quick edit.
+        unset( $actions['inline hide-if-no-js'] );
+        // * remove the edit link.
+        unset( $actions['edit'] );
+
+        return $actions;
+    }
+
+    /**
+     * Override the capabilities related to managing the entity type terms
+     * for multisite super admin to prevent it from manipulating it in any
+     * way.
+     *
+     * @since 3.12.0
+     *
+     * @param array  $caps    The user's current capabilities.
+     * @param string $cap     Capability name.
+     * @param int    $user_id The user ID.
+     * @param array  $args    Adds the context to the cap. Typically the object ID.
+     *
+     * @return array    Array containing the do_not_allow capability for super admin
+     *                  when editing and deleting entity type terms capabilities
+     *                    are being "approved"
+     */
+    function restrict_super_admin( $caps, $cap, $user_id, $args ) {
+
+        switch ( $cap ) {
+            case 'wl_entity_type_edit_term':
+            case 'wl_entity_type_delete_term':
+                $caps[] = 'do_not_allow';
+        }
+
+        return $caps;
+    }
+
+    /**
+     * Override the capabilities related to managing the entity type terms
+     * required for WordPress < 4.7 to get access to the admin page.
+     *
+     * Before 4.7, WordPress checks whether the user has permission to access
+     * the `edit-tags.php` page. So we need to provide temporary the permission
+     * otherwise the user will get an `access not allowed` when trying to access
+     * the page.
+     *
+     * @see   https://github.com/insideout10/wordlift-plugin/issues/512
+     *
+     * @since 3.12.0
+     *
+     * @param array  $caps    The user's current capabilities.
+     * @param string $cap     Capability name.
+     * @param int    $user_id The user ID.
+     * @param array  $args    Adds the context to the cap. Typically the object ID.
+     *
+     * @return array    Array containing the manage_options capability
+     */
+    function enable_admin_access_pre_47( $caps, $cap, $user_id, $args ) {
+
+        // Bail out if we're not dealing with the `wl_entity_type_edit_term`
+        // capability.
+        if ( 'wl_entity_type_edit_term' !== $cap ) {
+            return $caps;
+        }
+
+        $path = parse_url( $_SERVER['REQUEST_URI'], PHP_URL_PATH );
+
+        // Bail out if the `path` cannot be determined.
+        if ( null === $path ) {
+            return $caps;
+        }
+
+        // Bail out if a specific term is being handled.
+        if ( isset( $_REQUEST['action'] ) ) {
+            return $caps;
+        }
+
+        // Split the path and check if the page is the `edit-tags.php`. We can't
+        // use WP's own function because this is called very early.
+        $components = explode( '/', $path );
+        if ( 'edit-tags.php' !== $components[ count( $components ) - 1 ] ) {
+            return $caps;
+        }
+
+        // Give permission to the user.
+        $mapped[] = 'manage_options';
+
+        return $mapped;
+    }
 
 }

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
  * @since      3.11.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -43,16 +43,16 @@ 
 	 * @return array  $actions An array of action links to be displayed. Default
 	 *                        'Edit', 'Quick Edit', 'Delete', and 'View'.
 	 */
-	function wl_entity_type_row_actions( $actions, $term ) {
+	function wl_entity_type_row_actions($actions, $term) {
 
-		$url               = admin_url( "admin.php?page=wl_entity_type_settings&tag_ID=$term->term_id" );
-		$actions['wl-seo'] = '<a href="' . esc_url( $url ) . '">' . __( 'SEO Settings', 'wordlift' ) . '</a>';
+		$url               = admin_url("admin.php?page=wl_entity_type_settings&tag_ID=$term->term_id");
+		$actions['wl-seo'] = '<a href="'.esc_url($url).'">'.__('SEO Settings', 'wordlift').'</a>';
 
 		// Hacks for pre 4.7 compatibility:
 		// * remove the quick edit.
-		unset( $actions['inline hide-if-no-js'] );
+		unset($actions['inline hide-if-no-js']);
 		// * remove the edit link.
-		unset( $actions['edit'] );
+		unset($actions['edit']);
 
 		return $actions;
 	}
@@ -73,9 +73,9 @@ 
 	 *                  when editing and deleting entity type terms capabilities
 	 *                    are being "approved"
 	 */
-	function restrict_super_admin( $caps, $cap, $user_id, $args ) {
+	function restrict_super_admin($caps, $cap, $user_id, $args) {
 
-		switch ( $cap ) {
+		switch ($cap) {
 			case 'wl_entity_type_edit_term':
 			case 'wl_entity_type_delete_term':
 				$caps[] = 'do_not_allow';
@@ -104,30 +104,30 @@ 
 	 *
 	 * @return array    Array containing the manage_options capability
 	 */
-	function enable_admin_access_pre_47( $caps, $cap, $user_id, $args ) {
+	function enable_admin_access_pre_47($caps, $cap, $user_id, $args) {
 
 		// Bail out if we're not dealing with the `wl_entity_type_edit_term`
 		// capability.
-		if ( 'wl_entity_type_edit_term' !== $cap ) {
+		if ('wl_entity_type_edit_term' !== $cap) {
 			return $caps;
 		}
 
-		$path = parse_url( $_SERVER['REQUEST_URI'], PHP_URL_PATH );
+		$path = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
 
 		// Bail out if the `path` cannot be determined.
-		if ( null === $path ) {
+		if (null === $path) {
 			return $caps;
 		}
 
 		// Bail out if a specific term is being handled.
-		if ( isset( $_REQUEST['action'] ) ) {
+		if (isset($_REQUEST['action'])) {
 			return $caps;
 		}
 
 		// Split the path and check if the page is the `edit-tags.php`. We can't
 		// use WP's own function because this is called very early.
-		$components = explode( '/', $path );
-		if ( 'edit-tags.php' !== $components[ count( $components ) - 1 ] ) {
+		$components = explode('/', $path);
+		if ('edit-tags.php' !== $components[count($components) - 1]) {
 			return $caps;
 		}
 

src/modules/prefixes/wordlift_prefixes.php

Indentation +28 added lines, -28 removed lines

@@ -15,34 +15,34 @@
  */
 function wl_prefixes_list() {
 
-	// If the parameter is false, default prefixes have never been installed.
-	if ( false === ( $prefixes = get_option( 'wl_option_prefixes' ) ) ) {
+    // If the parameter is false, default prefixes have never been installed.
+    if ( false === ( $prefixes = get_option( 'wl_option_prefixes' ) ) ) {
 
-		$prefixes = array(
-			array(
-				'prefix'    => 'geo',
-				'namespace' => 'http://www.w3.org/2003/01/geo/wgs84_pos#',
-			),
-			array(
-				'prefix'    => 'dct',
-				'namespace' => 'http://purl.org/dc/terms/',
-			),
-			array(
-				'prefix'    => 'rdfs',
-				'namespace' => 'http://www.w3.org/2000/01/rdf-schema#',
-			),
-			array(
-				'prefix'    => 'owl',
-				'namespace' => 'http://www.w3.org/2002/07/owl#',
-			),
-			array( 'prefix' => 'schema', 'namespace' => 'http://schema.org/' ),
-			array(
-				'prefix'    => 'xsd',
-				'namespace' => 'http://www.w3.org/2001/XMLSchema#',
-			),
-		);
-		add_option( 'wl_option_prefixes', $prefixes );
-	}
+        $prefixes = array(
+            array(
+                'prefix'    => 'geo',
+                'namespace' => 'http://www.w3.org/2003/01/geo/wgs84_pos#',
+            ),
+            array(
+                'prefix'    => 'dct',
+                'namespace' => 'http://purl.org/dc/terms/',
+            ),
+            array(
+                'prefix'    => 'rdfs',
+                'namespace' => 'http://www.w3.org/2000/01/rdf-schema#',
+            ),
+            array(
+                'prefix'    => 'owl',
+                'namespace' => 'http://www.w3.org/2002/07/owl#',
+            ),
+            array( 'prefix' => 'schema', 'namespace' => 'http://schema.org/' ),
+            array(
+                'prefix'    => 'xsd',
+                'namespace' => 'http://www.w3.org/2001/XMLSchema#',
+            ),
+        );
+        add_option( 'wl_option_prefixes', $prefixes );
+    }
 
-	return $prefixes;
+    return $prefixes;
 }

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
 function wl_prefixes_list() {
 
 	// If the parameter is false, default prefixes have never been installed.
-	if ( false === ( $prefixes = get_option( 'wl_option_prefixes' ) ) ) {
+	if (false === ($prefixes = get_option('wl_option_prefixes'))) {
 
 		$prefixes = array(
 			array(
@@ -35,13 +35,13 @@ 
 				'prefix'    => 'owl',
 				'namespace' => 'http://www.w3.org/2002/07/owl#',
 			),
-			array( 'prefix' => 'schema', 'namespace' => 'http://schema.org/' ),
+			array('prefix' => 'schema', 'namespace' => 'http://schema.org/'),
 			array(
 				'prefix'    => 'xsd',
 				'namespace' => 'http://www.w3.org/2001/XMLSchema#',
 			),
 		);
-		add_option( 'wl_option_prefixes', $prefixes );
+		add_option('wl_option_prefixes', $prefixes);
 	}
 
 	return $prefixes;

src/admin/class-wordlift-admin-status-page.php

Indentation +132 added lines, -132 removed lines

@@ -58,137 +58,137 @@
 //		return sizeof( $results );
 //	}
 
-	/**
-	 * The {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.12.2
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-	/**
-	 * @var
-	 */
-	private $sparql_service;
-
-	/**
-	 * Create a {@link Wordlift_Admin_Status_Page} instance.
-	 *
-	 * @since 3.12.2
-	 *
-	 * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 * @param \Wordlift_Sparql_Service $sparql_service The {@link Wordlift_Sparql_Service} instance.
-	 */
-	public function __construct( $entity_service, $sparql_service ) {
-
-		$this->entity_service = $entity_service;
-		$this->sparql_service = $sparql_service;
-
-	}
-
-	/**
-	 * Get the list of entity URIs.
-	 *
-	 * @since 3.12.2
-	 * @return array An array of entity URIs.
-	 */
-	protected function get_entity_uris() {
-
-		// Get the entity IDs.
-		$ids = $this->entity_service->get( array(
-			'numberposts' => - 1,
-			'fields'      => 'ids',
-			'post_status' => 'publish',
-		) );
-
-		// Create a reference to the entity service for the closure.
-		$entity_service = $this->entity_service;
-
-		// Combine IDs with URIs.
-		return array_combine( $ids, array_map( function ( $item ) use ( $entity_service ) {
-			return $entity_service->get_uri( $item );
-		}, $ids ) );
-	}
-
-	/**
-	 * Get the list of URIs in the Linked Data Cloud.
-	 *
-	 * @since 3.12.2
-	 * @return array|null An array of URIs.
-	 */
-	protected function get_linked_data_uris() {
-
-		// Prepare the query to get the URIs from the Linked Data Cloud.
-		$query = Wordlift_Query_Builder::new_instance()
-		                               ->select( 'DISTINCT ?s' )
-		                               ->statement( '?s', Wordlift_Query_Builder::RDFS_TYPE_URI, '?o' )
-		                               ->build();
-
-		// Execute the query.
-		$response = $this->sparql_service->select( $query );
-
-		// If the response is an error, return null.
-		if ( is_a( $response, 'WP_Error' ) ) {
-			return null;
-		}
-
-		// Split the response into single URIs.
-		$uris = preg_split( "/(\r\n|\n|\r)/", $response['body'] );
-
-		// Remove the header.
-		unset( $uris[0] );
-
-		// Finally return the URIs.
-		return $uris;
-	}
-
-	/**
-	 * Get the page title. Will be translated.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @return string The page title.
-	 */
-	function get_page_title() {
-
-		return _x( 'Status Report', 'Page title', 'wordlift' );
-	}
-
-	/**
-	 * Get the menu title. Will be translated.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @return string The menu title.
-	 */
-	function get_menu_title() {
-
-		return _x( 'Status Report', 'Menu title', 'wordlift' );
-	}
-
-	/**
-	 * Get the menu slug.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @return string The menu slug.
-	 */
-	function get_menu_slug() {
-
-		return 'wl_status_report';
-	}
-
-	/**
-	 * Get the partial file name, used in the {@link render} function.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @return string The partial file name.
-	 */
-	function get_partial_name() {
-
-
-		return 'wordlift-admin-status-page.php';
-	}
+    /**
+     * The {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.12.2
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+    /**
+     * @var
+     */
+    private $sparql_service;
+
+    /**
+     * Create a {@link Wordlift_Admin_Status_Page} instance.
+     *
+     * @since 3.12.2
+     *
+     * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     * @param \Wordlift_Sparql_Service $sparql_service The {@link Wordlift_Sparql_Service} instance.
+     */
+    public function __construct( $entity_service, $sparql_service ) {
+
+        $this->entity_service = $entity_service;
+        $this->sparql_service = $sparql_service;
+
+    }
+
+    /**
+     * Get the list of entity URIs.
+     *
+     * @since 3.12.2
+     * @return array An array of entity URIs.
+     */
+    protected function get_entity_uris() {
+
+        // Get the entity IDs.
+        $ids = $this->entity_service->get( array(
+            'numberposts' => - 1,
+            'fields'      => 'ids',
+            'post_status' => 'publish',
+        ) );
+
+        // Create a reference to the entity service for the closure.
+        $entity_service = $this->entity_service;
+
+        // Combine IDs with URIs.
+        return array_combine( $ids, array_map( function ( $item ) use ( $entity_service ) {
+            return $entity_service->get_uri( $item );
+        }, $ids ) );
+    }
+
+    /**
+     * Get the list of URIs in the Linked Data Cloud.
+     *
+     * @since 3.12.2
+     * @return array|null An array of URIs.
+     */
+    protected function get_linked_data_uris() {
+
+        // Prepare the query to get the URIs from the Linked Data Cloud.
+        $query = Wordlift_Query_Builder::new_instance()
+                                        ->select( 'DISTINCT ?s' )
+                                        ->statement( '?s', Wordlift_Query_Builder::RDFS_TYPE_URI, '?o' )
+                                        ->build();
+
+        // Execute the query.
+        $response = $this->sparql_service->select( $query );
+
+        // If the response is an error, return null.
+        if ( is_a( $response, 'WP_Error' ) ) {
+            return null;
+        }
+
+        // Split the response into single URIs.
+        $uris = preg_split( "/(\r\n|\n|\r)/", $response['body'] );
+
+        // Remove the header.
+        unset( $uris[0] );
+
+        // Finally return the URIs.
+        return $uris;
+    }
+
+    /**
+     * Get the page title. Will be translated.
+     *
+     * @since 3.11.0
+     *
+     * @return string The page title.
+     */
+    function get_page_title() {
+
+        return _x( 'Status Report', 'Page title', 'wordlift' );
+    }
+
+    /**
+     * Get the menu title. Will be translated.
+     *
+     * @since 3.11.0
+     *
+     * @return string The menu title.
+     */
+    function get_menu_title() {
+
+        return _x( 'Status Report', 'Menu title', 'wordlift' );
+    }
+
+    /**
+     * Get the menu slug.
+     *
+     * @since 3.11.0
+     *
+     * @return string The menu slug.
+     */
+    function get_menu_slug() {
+
+        return 'wl_status_report';
+    }
+
+    /**
+     * Get the partial file name, used in the {@link render} function.
+     *
+     * @since 3.11.0
+     *
+     * @return string The partial file name.
+     */
+    function get_partial_name() {
+
+
+        return 'wordlift-admin-status-page.php';
+    }
 
 }

Spacing +15 added lines, -15 removed lines

@@ -79,7 +79,7 @@ 
 	 * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
 	 * @param \Wordlift_Sparql_Service $sparql_service The {@link Wordlift_Sparql_Service} instance.
 	 */
-	public function __construct( $entity_service, $sparql_service ) {
+	public function __construct($entity_service, $sparql_service) {
 
 		$this->entity_service = $entity_service;
 		$this->sparql_service = $sparql_service;
@@ -95,19 +95,19 @@ 
 	protected function get_entity_uris() {
 
 		// Get the entity IDs.
-		$ids = $this->entity_service->get( array(
-			'numberposts' => - 1,
+		$ids = $this->entity_service->get(array(
+			'numberposts' => -1,
 			'fields'      => 'ids',
 			'post_status' => 'publish',
-		) );
+		));
 
 		// Create a reference to the entity service for the closure.
 		$entity_service = $this->entity_service;
 
 		// Combine IDs with URIs.
-		return array_combine( $ids, array_map( function ( $item ) use ( $entity_service ) {
-			return $entity_service->get_uri( $item );
-		}, $ids ) );
+		return array_combine($ids, array_map(function($item) use ($entity_service) {
+			return $entity_service->get_uri($item);
+		}, $ids));
 	}
 
 	/**
@@ -120,23 +120,23 @@ 
 
 		// Prepare the query to get the URIs from the Linked Data Cloud.
 		$query = Wordlift_Query_Builder::new_instance()
-		                               ->select( 'DISTINCT ?s' )
-		                               ->statement( '?s', Wordlift_Query_Builder::RDFS_TYPE_URI, '?o' )
+		                               ->select('DISTINCT ?s')
+		                               ->statement('?s', Wordlift_Query_Builder::RDFS_TYPE_URI, '?o')
 		                               ->build();
 
 		// Execute the query.
-		$response = $this->sparql_service->select( $query );
+		$response = $this->sparql_service->select($query);
 
 		// If the response is an error, return null.
-		if ( is_a( $response, 'WP_Error' ) ) {
+		if (is_a($response, 'WP_Error')) {
 			return null;
 		}
 
 		// Split the response into single URIs.
-		$uris = preg_split( "/(\r\n|\n|\r)/", $response['body'] );
+		$uris = preg_split("/(\r\n|\n|\r)/", $response['body']);
 
 		// Remove the header.
-		unset( $uris[0] );
+		unset($uris[0]);
 
 		// Finally return the URIs.
 		return $uris;
@@ -151,7 +151,7 @@ 
 	 */
 	function get_page_title() {
 
-		return _x( 'Status Report', 'Page title', 'wordlift' );
+		return _x('Status Report', 'Page title', 'wordlift');
 	}
 
 	/**
@@ -163,7 +163,7 @@ 
 	 */
 	function get_menu_title() {
 
-		return _x( 'Status Report', 'Menu title', 'wordlift' );
+		return _x('Status Report', 'Menu title', 'wordlift');
 	}
 
 	/**

src/admin/class-wordlift-admin-settings-page.php

Doc Comments +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
 	 * Get the singleton instance of the Notice service.
 	 *
 	 * @since 3.14.0
-	 * @return \Wordlift_Admin_Settings_Page The singleton instance of the settings page service.
+	 * @return Wordlift_Notice_Service The singleton instance of the settings page service.
 	 */
 	public static function get_instance() {
 

Spacing +54 added lines, -54 removed lines

@@ -103,7 +103,7 @@ 
 	 * @param \Wordlift_Admin_Publisher_Element       $publisher_element A {@link Wordlift_Admin_Publisher_Element} element renderer.
 	 * @param \Wordlift_Admin_Radio_Input_Element     $radio_input_element A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
 	 */
-	function __construct( $configuration_service, $entity_service, $input_element, $language_select_element, $country_select_element, $publisher_element, $radio_input_element ) {
+	function __construct($configuration_service, $entity_service, $input_element, $language_select_element, $country_select_element, $publisher_element, $radio_input_element) {
 
 		$this->configuration_service = $configuration_service;
 		$this->entity_service        = $entity_service;
@@ -187,8 +187,8 @@ 
 
 		// JavaScript required for the settings page.
 		// @todo: try to move to the `wordlift-admin.bundle.js`.
-		wp_enqueue_script( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/settings.js', array( 'wp-util' ) );
-		wp_enqueue_style( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/settings.css' );
+		wp_enqueue_script('wordlift-admin-settings-page', plugin_dir_url(dirname(__FILE__)).'admin/js/1/settings.js', array('wp-util'));
+		wp_enqueue_style('wordlift-admin-settings-page', plugin_dir_url(dirname(__FILE__)).'admin/js/1/settings.css');
 
 	}
 
@@ -206,22 +206,22 @@ 
 		register_setting(
 			'wl_general_settings',
 			'wl_general_settings',
-			array( $this, 'sanitize_callback' )
+			array($this, 'sanitize_callback')
 		);
 
 		// Add the general settings section.
 		add_settings_section(
 			'wl_general_settings_section', // ID used to identify this section and with which to register options.
-			'',                            // Section header.
-			'',                            // Callback used to render the description of the section.
+			'', // Section header.
+			'', // Callback used to render the description of the section.
 			'wl_general_settings'          // Page on which to add this section of options.
 		);
 
 		$key_args = array(
 			'id'          => 'wl-key',
-			'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::KEY . ']',
+			'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::KEY.']',
 			'value'       => $this->configuration_service->get_key(),
-			'description' => __( 'Insert the <a href="https://www.wordlift.io/blogger">WordLift Key</a> you received via email.', 'wordlift' ),
+			'description' => __('Insert the <a href="https://www.wordlift.io/blogger">WordLift Key</a> you received via email.', 'wordlift'),
 		);
 
 		// Before we were used to validate the key beforehand, but this means
@@ -234,12 +234,12 @@ 
 
 		// Add the `key` field.
 		add_settings_field(
-			'wl-key',                                       // Element id used to identify the field throughout the theme.
-			__( 'WordLift Key', 'wordlift' ),               // The label to the left of the option interface element.
+			'wl-key', // Element id used to identify the field throughout the theme.
+			__('WordLift Key', 'wordlift'), // The label to the left of the option interface element.
 			// The name of the function responsible for rendering the option interface.
-			array( $this->input_element, 'render' ),
-			'wl_general_settings',                          // The page on which this option will be displayed.
-			'wl_general_settings_section',                  // The name of the section to which this field belongs.
+			array($this->input_element, 'render'),
+			'wl_general_settings', // The page on which this option will be displayed.
+			'wl_general_settings_section', // The name of the section to which this field belongs.
 			$key_args                                       // The array of arguments to pass to the callback. In this case, just a description.
 		);
 
@@ -247,10 +247,10 @@ 
 		$entity_base_path_args = array(
 			// The array of arguments to pass to the callback. In this case, just a description.
 			'id'          => 'wl-entity-base-path',
-			'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::ENTITY_BASE_PATH_KEY . ']',
+			'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::ENTITY_BASE_PATH_KEY.']',
 			'value'       => $this->configuration_service->get_entity_base_path(),
 			/* translators: Placeholders: %s - a link to FAQ's page. */
-			'description' => sprintf( __( 'All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field above. Check our <a href="%s">FAQs</a> if you need more info.', 'wordlift' ), 'https://wordlift.io/wordlift-user-faqs/#10-why-and-how-should-i-customize-the-url-of-the-entity-pages-created-in-my-vocabulary' ),
+			'description' => sprintf(__('All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field above. Check our <a href="%s">FAQs</a> if you need more info.', 'wordlift'), 'https://wordlift.io/wordlift-user-faqs/#10-why-and-how-should-i-customize-the-url-of-the-entity-pages-created-in-my-vocabulary'),
 		);
 
 		// The following call is very heavy on large web sites and is always run
@@ -259,94 +259,94 @@ 
 		//
 		// It is now replaced by a filter to add the `readonly` flag to the
 		// input element when this is actually rendered.
-		add_filter( 'wl_admin_input_element_params', array(
+		add_filter('wl_admin_input_element_params', array(
 			$this,
 			'entity_path_input_element_params',
-		) );
+		));
 
 		// Add the `wl_entity_base_path` field.
 		add_settings_field(
-			'wl-entity-base-path',                                // ID used to identify the field throughout the theme
-			__( 'Entity Base Path', 'wordlift' ),                 // The label to the left of the option interface element
+			'wl-entity-base-path', // ID used to identify the field throughout the theme
+			__('Entity Base Path', 'wordlift'), // The label to the left of the option interface element
 			// The name of the function responsible for rendering the option interface
-			array( $this->input_element, 'render', ),
-			'wl_general_settings',                                // The page on which this option will be displayed
-			'wl_general_settings_section',                        // The name of the section to which this field belongs
+			array($this->input_element, 'render',),
+			'wl_general_settings', // The page on which this option will be displayed
+			'wl_general_settings_section', // The name of the section to which this field belongs
 			$entity_base_path_args
 		);
 
 		// Add the `language_name` field.
 		add_settings_field(
 			'wl-site-language',
-			__( 'Site Language', 'wordlift' ),
-			array( $this->language_select_element, 'render' ),
+			__('Site Language', 'wordlift'),
+			array($this->language_select_element, 'render'),
 			'wl_general_settings',
 			'wl_general_settings_section',
 			array(
 				// The array of arguments to pass to the callback. In this case, just a description.
 				'id'          => 'wl-site-language',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LANGUAGE . ']',
+				'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::LANGUAGE.']',
 				'value'       => $this->configuration_service->get_language_code(),
-				'description' => __( 'Each WordLift Key can be used only in one language. Pick yours.', 'wordlift' ),
+				'description' => __('Each WordLift Key can be used only in one language. Pick yours.', 'wordlift'),
 			)
 		);
 
 		// Add the `country_code` field.
 		add_settings_field(
 			'wl-country-code',
-			_x( 'Country', 'wordlift' ),
-			array( $this->country_select_element, 'render' ),
+			_x('Country', 'wordlift'),
+			array($this->country_select_element, 'render'),
 			'wl_general_settings',
 			'wl_general_settings_section',
 			array(
 				'id'          => 'wl-country-code',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::COUNTRY_CODE . ']',
+				'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::COUNTRY_CODE.']',
 				'value'       => $this->configuration_service->get_country_code(),
-				'description' => __( 'Please select a country.', 'wordlift' ),
-				'notice'      => __( 'The selected language is not supported in this country.</br>Please choose another country or language.', 'wordlift' ),
+				'description' => __('Please select a country.', 'wordlift'),
+				'notice'      => __('The selected language is not supported in this country.</br>Please choose another country or language.', 'wordlift'),
 			)
 		);
 
 		// Add the `publisher` field.
 		add_settings_field(
 			'wl-publisher-id',
-			__( 'Publisher', 'wordlift' ),
-			array( $this->publisher_element, 'render' ),
+			__('Publisher', 'wordlift'),
+			array($this->publisher_element, 'render'),
 			'wl_general_settings',
 			'wl_general_settings_section',
 			array(
 				'id'   => 'wl-publisher-id',
-				'name' => 'wl_general_settings[' . Wordlift_Configuration_Service::PUBLISHER_ID . ']',
+				'name' => 'wl_general_settings['.Wordlift_Configuration_Service::PUBLISHER_ID.']',
 			)
 		);
 
 		// Add the `link by default` field.
 		add_settings_field(
 			'wl-link-by-default',
-			__( 'Link by Default', 'wordlift' ),
-			array( $this->radio_input_element, 'render' ),
+			__('Link by Default', 'wordlift'),
+			array($this->radio_input_element, 'render'),
 			'wl_general_settings',
 			'wl_general_settings_section',
 			array(
 				'id'          => 'wl-link-by-default',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LINK_BY_DEFAULT . ']',
+				'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::LINK_BY_DEFAULT.']',
 				'value'       => $this->configuration_service->is_link_by_default() ? 'yes' : 'no',
-				'description' => __( 'Whether to link entities by default or not. This setting applies to all the entities.', 'wordlift' ),
+				'description' => __('Whether to link entities by default or not. This setting applies to all the entities.', 'wordlift'),
 			)
 		);
 
 		// Add the `diagnostic data` field.
 		add_settings_field(
 			'wl-send-diagnostic',
-			__( 'Send Diagnostic Data', 'wordlift' ),
-			array( $this->radio_input_element, 'render' ),
+			__('Send Diagnostic Data', 'wordlift'),
+			array($this->radio_input_element, 'render'),
 			'wl_general_settings',
 			'wl_general_settings_section',
 			array(
 				'id'          => 'wl-send-diagnostic',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::SEND_DIAGNOSTIC . ']',
+				'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::SEND_DIAGNOSTIC.']',
 				'value'       => 'yes' === $this->configuration_service->get_diagnostic_preferences() ? 'yes' : 'no',
-				'description' => __( 'Whether to send diagnostic data or not.', 'wordlift' ),
+				'description' => __('Whether to send diagnostic data or not.', 'wordlift'),
 			)
 		);
 
@@ -362,10 +362,10 @@ 
 	 *
 	 * @return array The updated array.
 	 */
-	public function entity_path_input_element_params( $args ) {
+	public function entity_path_input_element_params($args) {
 
 		// Bail out if it's not the `wl-entity-base-path`).
-		if ( 'wl-entity-base-path' !== $args['id'] ) {
+		if ('wl-entity-base-path' !== $args['id']) {
 			return $args;
 		}
 
@@ -388,23 +388,23 @@ 
 	 *
 	 * @return array The sanitized input array.
 	 */
-	function sanitize_callback( $input ) {
+	function sanitize_callback($input) {
 
 		// Validate the selected country.
 		$this->validate_country();
 
 		// Check whether a publisher name has been set.
-		if ( isset( $_POST['wl_publisher'] ) && ! empty( $_POST['wl_publisher']['name'] ) ) { // WPCS: CSRF, input var, sanitization ok.
+		if (isset($_POST['wl_publisher']) && ! empty($_POST['wl_publisher']['name'])) { // WPCS: CSRF, input var, sanitization ok.
 			$name         = $_POST['wl_publisher']['name']; // WPCS: CSRF, input var, sanitization ok.
 			$type         = $_POST['wl_publisher']['type']; // WPCS: CSRF, input var, sanitization ok.
 			$thumbnail_id = $_POST['wl_publisher']['thumbnail_id'] ?: null; // WPCS: CSRF, input var, sanitization ok.
 
 			// Set the type URI, either http://schema.org/Person or http://schema.org/Organization.
-			$type_uri = sprintf( 'http://schema.org/%s', 'organization' === $type ? 'Organization' : 'Person' );
+			$type_uri = sprintf('http://schema.org/%s', 'organization' === $type ? 'Organization' : 'Person');
 
 			// Create an entity for the publisher and assign it to the input
 			// parameter which WordPress automatically saves into the settings.
-			$input['publisher_id'] = $this->entity_service->create( $name, $type_uri, $thumbnail_id, 'publish' );
+			$input['publisher_id'] = $this->entity_service->create($name, $type_uri, $thumbnail_id, 'publish');
 		}
 
 		return $input;
@@ -419,8 +419,8 @@ 
 
 		// Bail out if for some reason the country and language are not set.
 		if (
-			empty( $_POST['wl_general_settings']['site_language'] ) && // WPCS: CSRF, input var, sanitization ok.
-			empty( $_POST['wl_general_settings']['country_code'] ) // WPCS: CSRF, input var, sanitization ok.
+			empty($_POST['wl_general_settings']['site_language']) && // WPCS: CSRF, input var, sanitization ok.
+			empty($_POST['wl_general_settings']['country_code']) // WPCS: CSRF, input var, sanitization ok.
 		) {
 			return;
 		}
@@ -433,14 +433,14 @@ 
 		// Check whether the chosen country has language limitations
 		// and whether the chosen language is supported for that country.
 		if (
-			! empty( $codes[ $country ] ) &&
-			! in_array( $language, $codes[ $country ] )
+			! empty($codes[$country]) &&
+			! in_array($language, $codes[$country])
 		) {
 			// Otherwise add an error.
 			add_settings_error(
 				'wl-country-code',
-				esc_attr( 'settings_updated' ),
-				_x( 'The selected language is not supported for the currently chosen country. Please choose another country or language.', 'wordlift' )
+				esc_attr('settings_updated'),
+				_x('The selected language is not supported for the currently chosen country. Please choose another country or language.', 'wordlift')
 			);
 		}
 	}

Indentation +426 added lines, -426 removed lines

@@ -18,431 +18,431 @@
  */
 class Wordlift_Admin_Settings_Page extends Wordlift_Admin_Page {
 
-	/**
-	 * A singleton instance of the Notice service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_Notice_Service $instance A singleton instance of the Notice service.
-	 */
-	private static $instance;
-
-	/**
-	 * A {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * A {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * A {@link Wordlift_Admin_Input_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Input_Element $input_element An {@link Wordlift_Admin_Input_Element} element renderer.
-	 */
-	private $input_element;
-
-	/**
-	 * A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
-	 *
-	 * @since  3.13.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Radio_Input_Element $radio_input_element A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
-	 */
-	private $radio_input_element;
-
-	/**
-	 * A {@link Wordlift_Admin_Language_Select_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Language_Select_Element $language_select_element A {@link Wordlift_Admin_Language_Select_Element} element renderer.
-	 */
-	private $language_select_element;
-
-	/**
-	 * A {@link Wordlift_Admin_Country_Select_Element} element renderer.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Admin_Country_Select_Element $country_select_element A {@link Wordlift_Admin_Country_Select_Element} element renderer.
-	 */
-	private $country_select_element;
-
-	/**
-	 * A {@link Wordlift_Admin_Publisher_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Publisher_Element $publisher_element A {@link Wordlift_Admin_Publisher_Element} element renderer.
-	 */
-	private $publisher_element;
-
-	/**
-	 * Create a {@link Wordlift_Admin_Settings_Page} instance.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param \Wordlift_Configuration_Service         $configuration_service A {@link Wordlift_Configuration_Service} instance.
-	 * @param \Wordlift_Entity_Service                $entity_service A {@link Wordlift_Entity_Service} instance.
-	 * @param \Wordlift_Admin_Input_Element           $input_element A {@link Wordlift_Admin_Input_Element} element renderer.
-	 * @param \Wordlift_Admin_Language_Select_Element $language_select_element A {@link Wordlift_Admin_Language_Select_Element} element renderer.
-	 * @param \Wordlift_Admin_Country_Select_Element  $country_select_element A {@link Wordlift_Admin_Country_Select_Element} element renderer.
-	 * @param \Wordlift_Admin_Publisher_Element       $publisher_element A {@link Wordlift_Admin_Publisher_Element} element renderer.
-	 * @param \Wordlift_Admin_Radio_Input_Element     $radio_input_element A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
-	 */
-	function __construct( $configuration_service, $entity_service, $input_element, $language_select_element, $country_select_element, $publisher_element, $radio_input_element ) {
-
-		$this->configuration_service = $configuration_service;
-		$this->entity_service        = $entity_service;
-
-		// Set a reference to the UI elements.
-		$this->input_element           = $input_element;
-		$this->radio_input_element     = $radio_input_element;
-		$this->language_select_element = $language_select_element;
-		$this->country_select_element  = $country_select_element;
-		$this->publisher_element       = $publisher_element;
-
-		self::$instance = $this;
-	}
-
-	/**
-	 * Get the singleton instance of the Notice service.
-	 *
-	 * @since 3.14.0
-	 * @return \Wordlift_Admin_Settings_Page The singleton instance of the settings page service.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_parent_slug() {
-
-		return 'wl_admin_menu';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_capability() {
-
-		return 'manage_options';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_page_title() {
-
-		return 'WordLift Settings';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_menu_title() {
-
-		return 'Settings';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_menu_slug() {
-
-		return 'wl_configuration_admin_menu';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_partial_name() {
-
-		return 'wordlift-admin-settings-page.php';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function enqueue_scripts() {
-
-		// Enqueue the media scripts to be used for the publisher's logo selection.
-		wp_enqueue_media();
-
-		// JavaScript required for the settings page.
-		// @todo: try to move to the `wordlift-admin.bundle.js`.
-		wp_enqueue_script( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/settings.js', array( 'wp-util' ) );
-		wp_enqueue_style( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/settings.css' );
-
-	}
-
-	/**
-	 * Configure all the configuration parameters.
-	 *
-	 * Called by the *admin_init* hook.
-	 *
-	 * @since 3.11.0
-	 */
-	function admin_init() {
-
-		// Register WordLift's general settings, providing our own sanitize callback
-		// which will also check whether the user filled the WL Publisher form.
-		register_setting(
-			'wl_general_settings',
-			'wl_general_settings',
-			array( $this, 'sanitize_callback' )
-		);
-
-		// Add the general settings section.
-		add_settings_section(
-			'wl_general_settings_section', // ID used to identify this section and with which to register options.
-			'',                            // Section header.
-			'',                            // Callback used to render the description of the section.
-			'wl_general_settings'          // Page on which to add this section of options.
-		);
-
-		$key_args = array(
-			'id'          => 'wl-key',
-			'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::KEY . ']',
-			'value'       => $this->configuration_service->get_key(),
-			'description' => __( 'Insert the <a href="https://www.wordlift.io/blogger">WordLift Key</a> you received via email.', 'wordlift' ),
-		);
-
-		// Before we were used to validate the key beforehand, but this means
-		// an http call whenever a page is opened in the admin area. Therefore
-		// we now leave the input `untouched`, leaving to the client to update
-		// the `css_class`.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/669.
-		$key_args['css_class'] = 'untouched';
-
-		// Add the `key` field.
-		add_settings_field(
-			'wl-key',                                       // Element id used to identify the field throughout the theme.
-			__( 'WordLift Key', 'wordlift' ),               // The label to the left of the option interface element.
-			// The name of the function responsible for rendering the option interface.
-			array( $this->input_element, 'render' ),
-			'wl_general_settings',                          // The page on which this option will be displayed.
-			'wl_general_settings_section',                  // The name of the section to which this field belongs.
-			$key_args                                       // The array of arguments to pass to the callback. In this case, just a description.
-		);
-
-		// Entity Base Path input.
-		$entity_base_path_args = array(
-			// The array of arguments to pass to the callback. In this case, just a description.
-			'id'          => 'wl-entity-base-path',
-			'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::ENTITY_BASE_PATH_KEY . ']',
-			'value'       => $this->configuration_service->get_entity_base_path(),
-			/* translators: Placeholders: %s - a link to FAQ's page. */
-			'description' => sprintf( __( 'All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field above. Check our <a href="%s">FAQs</a> if you need more info.', 'wordlift' ), 'https://wordlift.io/wordlift-user-faqs/#10-why-and-how-should-i-customize-the-url-of-the-entity-pages-created-in-my-vocabulary' ),
-		);
-
-		// The following call is very heavy on large web sites and is always run
-		// also when not needed:
-		// $entity_base_path_args['readonly'] = 0 < $this->entity_service->count();
-		//
-		// It is now replaced by a filter to add the `readonly` flag to the
-		// input element when this is actually rendered.
-		add_filter( 'wl_admin_input_element_params', array(
-			$this,
-			'entity_path_input_element_params',
-		) );
-
-		// Add the `wl_entity_base_path` field.
-		add_settings_field(
-			'wl-entity-base-path',                                // ID used to identify the field throughout the theme
-			__( 'Entity Base Path', 'wordlift' ),                 // The label to the left of the option interface element
-			// The name of the function responsible for rendering the option interface
-			array( $this->input_element, 'render', ),
-			'wl_general_settings',                                // The page on which this option will be displayed
-			'wl_general_settings_section',                        // The name of the section to which this field belongs
-			$entity_base_path_args
-		);
-
-		// Add the `language_name` field.
-		add_settings_field(
-			'wl-site-language',
-			__( 'Site Language', 'wordlift' ),
-			array( $this->language_select_element, 'render' ),
-			'wl_general_settings',
-			'wl_general_settings_section',
-			array(
-				// The array of arguments to pass to the callback. In this case, just a description.
-				'id'          => 'wl-site-language',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LANGUAGE . ']',
-				'value'       => $this->configuration_service->get_language_code(),
-				'description' => __( 'Each WordLift Key can be used only in one language. Pick yours.', 'wordlift' ),
-			)
-		);
-
-		// Add the `country_code` field.
-		add_settings_field(
-			'wl-country-code',
-			_x( 'Country', 'wordlift' ),
-			array( $this->country_select_element, 'render' ),
-			'wl_general_settings',
-			'wl_general_settings_section',
-			array(
-				'id'          => 'wl-country-code',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::COUNTRY_CODE . ']',
-				'value'       => $this->configuration_service->get_country_code(),
-				'description' => __( 'Please select a country.', 'wordlift' ),
-				'notice'      => __( 'The selected language is not supported in this country.</br>Please choose another country or language.', 'wordlift' ),
-			)
-		);
-
-		// Add the `publisher` field.
-		add_settings_field(
-			'wl-publisher-id',
-			__( 'Publisher', 'wordlift' ),
-			array( $this->publisher_element, 'render' ),
-			'wl_general_settings',
-			'wl_general_settings_section',
-			array(
-				'id'   => 'wl-publisher-id',
-				'name' => 'wl_general_settings[' . Wordlift_Configuration_Service::PUBLISHER_ID . ']',
-			)
-		);
-
-		// Add the `link by default` field.
-		add_settings_field(
-			'wl-link-by-default',
-			__( 'Link by Default', 'wordlift' ),
-			array( $this->radio_input_element, 'render' ),
-			'wl_general_settings',
-			'wl_general_settings_section',
-			array(
-				'id'          => 'wl-link-by-default',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LINK_BY_DEFAULT . ']',
-				'value'       => $this->configuration_service->is_link_by_default() ? 'yes' : 'no',
-				'description' => __( 'Whether to link entities by default or not. This setting applies to all the entities.', 'wordlift' ),
-			)
-		);
-
-		// Add the `diagnostic data` field.
-		add_settings_field(
-			'wl-send-diagnostic',
-			__( 'Send Diagnostic Data', 'wordlift' ),
-			array( $this->radio_input_element, 'render' ),
-			'wl_general_settings',
-			'wl_general_settings_section',
-			array(
-				'id'          => 'wl-send-diagnostic',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::SEND_DIAGNOSTIC . ']',
-				'value'       => 'yes' === $this->configuration_service->get_diagnostic_preferences() ? 'yes' : 'no',
-				'description' => __( 'Whether to send diagnostic data or not.', 'wordlift' ),
-			)
-		);
-
-	}
-
-	/**
-	 * Filter the {@link Wordlift_Admin_Input_Element} in order to add the
-	 * `readonly` flag to the `wl-entity-base-path` input.
-	 *
-	 * @since 3.17.0
-	 *
-	 * @param array $args An array of {@link Wordlift_Admin_Input_Element} parameters.
-	 *
-	 * @return array The updated array.
-	 */
-	public function entity_path_input_element_params( $args ) {
-
-		// Bail out if it's not the `wl-entity-base-path`).
-		if ( 'wl-entity-base-path' !== $args['id'] ) {
-			return $args;
-		}
-
-		// Set the readonly flag according to the entities count.
-		$args['readonly'] = 0 < $this->entity_service->count();
-
-		// Return the updated args.
-		return $args;
-	}
-
-	/**
-	 * Sanitize the configuration settings to be stored.
-	 *
-	 * If a new entity is being created for the publisher, create it and set The
-	 * publisher setting.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param array $input The configuration settings array.
-	 *
-	 * @return array The sanitized input array.
-	 */
-	function sanitize_callback( $input ) {
-
-		// Validate the selected country.
-		$this->validate_country();
-
-		// Check whether a publisher name has been set.
-		if ( isset( $_POST['wl_publisher'] ) && ! empty( $_POST['wl_publisher']['name'] ) ) { // WPCS: CSRF, input var, sanitization ok.
-			$name         = $_POST['wl_publisher']['name']; // WPCS: CSRF, input var, sanitization ok.
-			$type         = $_POST['wl_publisher']['type']; // WPCS: CSRF, input var, sanitization ok.
-			$thumbnail_id = $_POST['wl_publisher']['thumbnail_id'] ?: null; // WPCS: CSRF, input var, sanitization ok.
-
-			// Set the type URI, either http://schema.org/Person or http://schema.org/Organization.
-			$type_uri = sprintf( 'http://schema.org/%s', 'organization' === $type ? 'Organization' : 'Person' );
-
-			// Create an entity for the publisher and assign it to the input
-			// parameter which WordPress automatically saves into the settings.
-			$input['publisher_id'] = $this->entity_service->create( $name, $type_uri, $thumbnail_id, 'publish' );
-		}
-
-		return $input;
-	}
-
-	/**
-	 * Check whether the currently selected country supports the site language.
-	 *
-	 * @since 3.18.0
-	 */
-	private function validate_country() {
-
-		// Bail out if for some reason the country and language are not set.
-		if (
-			empty( $_POST['wl_general_settings']['site_language'] ) && // WPCS: CSRF, input var, sanitization ok.
-			empty( $_POST['wl_general_settings']['country_code'] ) // WPCS: CSRF, input var, sanitization ok.
-		) {
-			return;
-		}
-
-		// Get the values.
-		$language = $_POST['wl_general_settings']['site_language']; // WPCS: CSRF, input var, sanitization ok.
-		$country  = $_POST['wl_general_settings']['country_code']; // WPCS: CSRF, input var, sanitization ok.
-		$codes    = Wordlift_Countries::get_codes();
-
-		// Check whether the chosen country has language limitations
-		// and whether the chosen language is supported for that country.
-		if (
-			! empty( $codes[ $country ] ) &&
-			! in_array( $language, $codes[ $country ] )
-		) {
-			// Otherwise add an error.
-			add_settings_error(
-				'wl-country-code',
-				esc_attr( 'settings_updated' ),
-				_x( 'The selected language is not supported for the currently chosen country. Please choose another country or language.', 'wordlift' )
-			);
-		}
-	}
+    /**
+     * A singleton instance of the Notice service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_Notice_Service $instance A singleton instance of the Notice service.
+     */
+    private static $instance;
+
+    /**
+     * A {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+
+    /**
+     * A {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * A {@link Wordlift_Admin_Input_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Input_Element $input_element An {@link Wordlift_Admin_Input_Element} element renderer.
+     */
+    private $input_element;
+
+    /**
+     * A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
+     *
+     * @since  3.13.0
+     * @access protected
+     * @var \Wordlift_Admin_Radio_Input_Element $radio_input_element A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
+     */
+    private $radio_input_element;
+
+    /**
+     * A {@link Wordlift_Admin_Language_Select_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Language_Select_Element $language_select_element A {@link Wordlift_Admin_Language_Select_Element} element renderer.
+     */
+    private $language_select_element;
+
+    /**
+     * A {@link Wordlift_Admin_Country_Select_Element} element renderer.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Admin_Country_Select_Element $country_select_element A {@link Wordlift_Admin_Country_Select_Element} element renderer.
+     */
+    private $country_select_element;
+
+    /**
+     * A {@link Wordlift_Admin_Publisher_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Publisher_Element $publisher_element A {@link Wordlift_Admin_Publisher_Element} element renderer.
+     */
+    private $publisher_element;
+
+    /**
+     * Create a {@link Wordlift_Admin_Settings_Page} instance.
+     *
+     * @since 3.11.0
+     *
+     * @param \Wordlift_Configuration_Service         $configuration_service A {@link Wordlift_Configuration_Service} instance.
+     * @param \Wordlift_Entity_Service                $entity_service A {@link Wordlift_Entity_Service} instance.
+     * @param \Wordlift_Admin_Input_Element           $input_element A {@link Wordlift_Admin_Input_Element} element renderer.
+     * @param \Wordlift_Admin_Language_Select_Element $language_select_element A {@link Wordlift_Admin_Language_Select_Element} element renderer.
+     * @param \Wordlift_Admin_Country_Select_Element  $country_select_element A {@link Wordlift_Admin_Country_Select_Element} element renderer.
+     * @param \Wordlift_Admin_Publisher_Element       $publisher_element A {@link Wordlift_Admin_Publisher_Element} element renderer.
+     * @param \Wordlift_Admin_Radio_Input_Element     $radio_input_element A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
+     */
+    function __construct( $configuration_service, $entity_service, $input_element, $language_select_element, $country_select_element, $publisher_element, $radio_input_element ) {
+
+        $this->configuration_service = $configuration_service;
+        $this->entity_service        = $entity_service;
+
+        // Set a reference to the UI elements.
+        $this->input_element           = $input_element;
+        $this->radio_input_element     = $radio_input_element;
+        $this->language_select_element = $language_select_element;
+        $this->country_select_element  = $country_select_element;
+        $this->publisher_element       = $publisher_element;
+
+        self::$instance = $this;
+    }
+
+    /**
+     * Get the singleton instance of the Notice service.
+     *
+     * @since 3.14.0
+     * @return \Wordlift_Admin_Settings_Page The singleton instance of the settings page service.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_parent_slug() {
+
+        return 'wl_admin_menu';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_capability() {
+
+        return 'manage_options';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_page_title() {
+
+        return 'WordLift Settings';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_menu_title() {
+
+        return 'Settings';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_menu_slug() {
+
+        return 'wl_configuration_admin_menu';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_partial_name() {
+
+        return 'wordlift-admin-settings-page.php';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function enqueue_scripts() {
+
+        // Enqueue the media scripts to be used for the publisher's logo selection.
+        wp_enqueue_media();
+
+        // JavaScript required for the settings page.
+        // @todo: try to move to the `wordlift-admin.bundle.js`.
+        wp_enqueue_script( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/settings.js', array( 'wp-util' ) );
+        wp_enqueue_style( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/settings.css' );
+
+    }
+
+    /**
+     * Configure all the configuration parameters.
+     *
+     * Called by the *admin_init* hook.
+     *
+     * @since 3.11.0
+     */
+    function admin_init() {
+
+        // Register WordLift's general settings, providing our own sanitize callback
+        // which will also check whether the user filled the WL Publisher form.
+        register_setting(
+            'wl_general_settings',
+            'wl_general_settings',
+            array( $this, 'sanitize_callback' )
+        );
+
+        // Add the general settings section.
+        add_settings_section(
+            'wl_general_settings_section', // ID used to identify this section and with which to register options.
+            '',                            // Section header.
+            '',                            // Callback used to render the description of the section.
+            'wl_general_settings'          // Page on which to add this section of options.
+        );
+
+        $key_args = array(
+            'id'          => 'wl-key',
+            'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::KEY . ']',
+            'value'       => $this->configuration_service->get_key(),
+            'description' => __( 'Insert the <a href="https://www.wordlift.io/blogger">WordLift Key</a> you received via email.', 'wordlift' ),
+        );
+
+        // Before we were used to validate the key beforehand, but this means
+        // an http call whenever a page is opened in the admin area. Therefore
+        // we now leave the input `untouched`, leaving to the client to update
+        // the `css_class`.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/669.
+        $key_args['css_class'] = 'untouched';
+
+        // Add the `key` field.
+        add_settings_field(
+            'wl-key',                                       // Element id used to identify the field throughout the theme.
+            __( 'WordLift Key', 'wordlift' ),               // The label to the left of the option interface element.
+            // The name of the function responsible for rendering the option interface.
+            array( $this->input_element, 'render' ),
+            'wl_general_settings',                          // The page on which this option will be displayed.
+            'wl_general_settings_section',                  // The name of the section to which this field belongs.
+            $key_args                                       // The array of arguments to pass to the callback. In this case, just a description.
+        );
+
+        // Entity Base Path input.
+        $entity_base_path_args = array(
+            // The array of arguments to pass to the callback. In this case, just a description.
+            'id'          => 'wl-entity-base-path',
+            'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::ENTITY_BASE_PATH_KEY . ']',
+            'value'       => $this->configuration_service->get_entity_base_path(),
+            /* translators: Placeholders: %s - a link to FAQ's page. */
+            'description' => sprintf( __( 'All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field above. Check our <a href="%s">FAQs</a> if you need more info.', 'wordlift' ), 'https://wordlift.io/wordlift-user-faqs/#10-why-and-how-should-i-customize-the-url-of-the-entity-pages-created-in-my-vocabulary' ),
+        );
+
+        // The following call is very heavy on large web sites and is always run
+        // also when not needed:
+        // $entity_base_path_args['readonly'] = 0 < $this->entity_service->count();
+        //
+        // It is now replaced by a filter to add the `readonly` flag to the
+        // input element when this is actually rendered.
+        add_filter( 'wl_admin_input_element_params', array(
+            $this,
+            'entity_path_input_element_params',
+        ) );
+
+        // Add the `wl_entity_base_path` field.
+        add_settings_field(
+            'wl-entity-base-path',                                // ID used to identify the field throughout the theme
+            __( 'Entity Base Path', 'wordlift' ),                 // The label to the left of the option interface element
+            // The name of the function responsible for rendering the option interface
+            array( $this->input_element, 'render', ),
+            'wl_general_settings',                                // The page on which this option will be displayed
+            'wl_general_settings_section',                        // The name of the section to which this field belongs
+            $entity_base_path_args
+        );
+
+        // Add the `language_name` field.
+        add_settings_field(
+            'wl-site-language',
+            __( 'Site Language', 'wordlift' ),
+            array( $this->language_select_element, 'render' ),
+            'wl_general_settings',
+            'wl_general_settings_section',
+            array(
+                // The array of arguments to pass to the callback. In this case, just a description.
+                'id'          => 'wl-site-language',
+                'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LANGUAGE . ']',
+                'value'       => $this->configuration_service->get_language_code(),
+                'description' => __( 'Each WordLift Key can be used only in one language. Pick yours.', 'wordlift' ),
+            )
+        );
+
+        // Add the `country_code` field.
+        add_settings_field(
+            'wl-country-code',
+            _x( 'Country', 'wordlift' ),
+            array( $this->country_select_element, 'render' ),
+            'wl_general_settings',
+            'wl_general_settings_section',
+            array(
+                'id'          => 'wl-country-code',
+                'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::COUNTRY_CODE . ']',
+                'value'       => $this->configuration_service->get_country_code(),
+                'description' => __( 'Please select a country.', 'wordlift' ),
+                'notice'      => __( 'The selected language is not supported in this country.</br>Please choose another country or language.', 'wordlift' ),
+            )
+        );
+
+        // Add the `publisher` field.
+        add_settings_field(
+            'wl-publisher-id',
+            __( 'Publisher', 'wordlift' ),
+            array( $this->publisher_element, 'render' ),
+            'wl_general_settings',
+            'wl_general_settings_section',
+            array(
+                'id'   => 'wl-publisher-id',
+                'name' => 'wl_general_settings[' . Wordlift_Configuration_Service::PUBLISHER_ID . ']',
+            )
+        );
+
+        // Add the `link by default` field.
+        add_settings_field(
+            'wl-link-by-default',
+            __( 'Link by Default', 'wordlift' ),
+            array( $this->radio_input_element, 'render' ),
+            'wl_general_settings',
+            'wl_general_settings_section',
+            array(
+                'id'          => 'wl-link-by-default',
+                'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LINK_BY_DEFAULT . ']',
+                'value'       => $this->configuration_service->is_link_by_default() ? 'yes' : 'no',
+                'description' => __( 'Whether to link entities by default or not. This setting applies to all the entities.', 'wordlift' ),
+            )
+        );
+
+        // Add the `diagnostic data` field.
+        add_settings_field(
+            'wl-send-diagnostic',
+            __( 'Send Diagnostic Data', 'wordlift' ),
+            array( $this->radio_input_element, 'render' ),
+            'wl_general_settings',
+            'wl_general_settings_section',
+            array(
+                'id'          => 'wl-send-diagnostic',
+                'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::SEND_DIAGNOSTIC . ']',
+                'value'       => 'yes' === $this->configuration_service->get_diagnostic_preferences() ? 'yes' : 'no',
+                'description' => __( 'Whether to send diagnostic data or not.', 'wordlift' ),
+            )
+        );
+
+    }
+
+    /**
+     * Filter the {@link Wordlift_Admin_Input_Element} in order to add the
+     * `readonly` flag to the `wl-entity-base-path` input.
+     *
+     * @since 3.17.0
+     *
+     * @param array $args An array of {@link Wordlift_Admin_Input_Element} parameters.
+     *
+     * @return array The updated array.
+     */
+    public function entity_path_input_element_params( $args ) {
+
+        // Bail out if it's not the `wl-entity-base-path`).
+        if ( 'wl-entity-base-path' !== $args['id'] ) {
+            return $args;
+        }
+
+        // Set the readonly flag according to the entities count.
+        $args['readonly'] = 0 < $this->entity_service->count();
+
+        // Return the updated args.
+        return $args;
+    }
+
+    /**
+     * Sanitize the configuration settings to be stored.
+     *
+     * If a new entity is being created for the publisher, create it and set The
+     * publisher setting.
+     *
+     * @since 3.11.0
+     *
+     * @param array $input The configuration settings array.
+     *
+     * @return array The sanitized input array.
+     */
+    function sanitize_callback( $input ) {
+
+        // Validate the selected country.
+        $this->validate_country();
+
+        // Check whether a publisher name has been set.
+        if ( isset( $_POST['wl_publisher'] ) && ! empty( $_POST['wl_publisher']['name'] ) ) { // WPCS: CSRF, input var, sanitization ok.
+            $name         = $_POST['wl_publisher']['name']; // WPCS: CSRF, input var, sanitization ok.
+            $type         = $_POST['wl_publisher']['type']; // WPCS: CSRF, input var, sanitization ok.
+            $thumbnail_id = $_POST['wl_publisher']['thumbnail_id'] ?: null; // WPCS: CSRF, input var, sanitization ok.
+
+            // Set the type URI, either http://schema.org/Person or http://schema.org/Organization.
+            $type_uri = sprintf( 'http://schema.org/%s', 'organization' === $type ? 'Organization' : 'Person' );
+
+            // Create an entity for the publisher and assign it to the input
+            // parameter which WordPress automatically saves into the settings.
+            $input['publisher_id'] = $this->entity_service->create( $name, $type_uri, $thumbnail_id, 'publish' );
+        }
+
+        return $input;
+    }
+
+    /**
+     * Check whether the currently selected country supports the site language.
+     *
+     * @since 3.18.0
+     */
+    private function validate_country() {
+
+        // Bail out if for some reason the country and language are not set.
+        if (
+            empty( $_POST['wl_general_settings']['site_language'] ) && // WPCS: CSRF, input var, sanitization ok.
+            empty( $_POST['wl_general_settings']['country_code'] ) // WPCS: CSRF, input var, sanitization ok.
+        ) {
+            return;
+        }
+
+        // Get the values.
+        $language = $_POST['wl_general_settings']['site_language']; // WPCS: CSRF, input var, sanitization ok.
+        $country  = $_POST['wl_general_settings']['country_code']; // WPCS: CSRF, input var, sanitization ok.
+        $codes    = Wordlift_Countries::get_codes();
+
+        // Check whether the chosen country has language limitations
+        // and whether the chosen language is supported for that country.
+        if (
+            ! empty( $codes[ $country ] ) &&
+            ! in_array( $language, $codes[ $country ] )
+        ) {
+            // Otherwise add an error.
+            add_settings_error(
+                'wl-country-code',
+                esc_attr( 'settings_updated' ),
+                _x( 'The selected language is not supported for the currently chosen country. Please choose another country or language.', 'wordlift' )
+            );
+        }
+    }
 
 }

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

Doc Comments +1 added lines, -1 removed lines

@@ -346,7 +346,7 @@
 	 *
 	 * @param int $user_id The {@link WP_User} `id`.
 	 *
-	 * @return int bool True if editing is denied otherwise false.
+	 * @return boolean bool True if editing is denied otherwise false.
 	 */
 	public function is_deny_editor_entity_create( $user_id ) {
 

Indentation +464 added lines, -464 removed lines

@@ -19,477 +19,477 @@
  */
 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;
-
-	/**
-	 * 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;
-
-	/**
-	 * The {@link Wordlift_Sparql_Service} instance.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Sparql_Service $sparql_service The {@link Wordlift_Sparql_Service} instance.
-	 */
-	private $sparql_service;
-
-	/**
-	 * The Entity service.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The Entity service.
-	 */
-	private $entity_service;
-
-	/**
-	 * Create an instance of the User service.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param \Wordlift_Sparql_Service $sparql_service The {@link Wordlift_Sparql_Service} instance.
-	 * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 */
-	public function __construct( $sparql_service, $entity_service ) {
-
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_User_Service' );
-
-		self::$instance = $this;
-
-		$this->sparql_service = $sparql_service;
-		$this->entity_service = $entity_service;
-
-		add_filter( 'user_has_cap', array( $this, 'has_cap' ), 10, 3 );
-	}
-
-	/**
-	 * Get the singleton instance of the User service.
-	 *
-	 * @since 3.1.7
-	 * @return \Wordlift_User_Service The singleton instance of the User service.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get the URI for a user.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int $user_id The user id
-	 *
-	 * @return false|string The user's URI or false in case of failure.
-	 */
-	public function get_uri( $user_id ) {
-
-		// Try to get the URI stored in the user's meta and return it if available.
-		if ( false !== ( $user_uri = $this->_get_uri( $user_id ) ) ) {
-			return $user_uri;
-		}
-
-		// Try to build an URI, return false in case of failure.
-		if ( false === ( $user_uri = $this->_build_uri( $user_id ) ) ) {
-			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.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @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.
-	 */
-	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}.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @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
-	 */
-	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.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int $user_id The user id.
-	 *
-	 * @return false|string The user's URI or false if not found.
-	 */
-	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.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int $user_id The user's id.
-	 *
-	 * @return false|string The user's URI or false in case of failure.
-	 */
-	private function _build_uri( $user_id ) {
-
-		// Get the user, return false in case of failure.
-		if ( false === ( $user = get_userdata( $user_id ) ) ) {
-			return false;
-		};
-
-		// If the nicename is not set, return a failure.
-		if ( empty( $user->user_nicename ) ) {
-			return false;
-		}
-
-		return wl_configuration_get_redlink_dataset_uri() . "/user/$user->user_nicename";
-	}
-
-	/**
-	 * Store the URI in user's meta.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @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.
-	 */
-	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
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param integer $user_id The ID of the user
-	 */
-	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
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param integer $user_id The ID of the user
-	 */
-	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.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param int $user_id The {@link WP_User} `id`.
-	 *
-	 * @return int bool True if editing is denied otherwise false.
-	 */
-	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.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param int $user_id The {@link WP_User} `id`.
-	 *
-	 * @return bool True if the {@link WP_User} is an editor otherwise false.
-	 */
-	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 );
-	}
-
-	/**
-	 * Check if an editor can create entities.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @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.
-	 */
-	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.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @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.
-	 */
-	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;
+
+    /**
+     * 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;
+
+    /**
+     * The {@link Wordlift_Sparql_Service} instance.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Sparql_Service $sparql_service The {@link Wordlift_Sparql_Service} instance.
+     */
+    private $sparql_service;
+
+    /**
+     * The Entity service.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The Entity service.
+     */
+    private $entity_service;
+
+    /**
+     * Create an instance of the User service.
+     *
+     * @since 3.1.7
+     *
+     * @param \Wordlift_Sparql_Service $sparql_service The {@link Wordlift_Sparql_Service} instance.
+     * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     */
+    public function __construct( $sparql_service, $entity_service ) {
+
+        $this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_User_Service' );
+
+        self::$instance = $this;
+
+        $this->sparql_service = $sparql_service;
+        $this->entity_service = $entity_service;
+
+        add_filter( 'user_has_cap', array( $this, 'has_cap' ), 10, 3 );
+    }
+
+    /**
+     * Get the singleton instance of the User service.
+     *
+     * @since 3.1.7
+     * @return \Wordlift_User_Service The singleton instance of the User service.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Get the URI for a user.
+     *
+     * @since 3.1.7
+     *
+     * @param int $user_id The user id
+     *
+     * @return false|string The user's URI or false in case of failure.
+     */
+    public function get_uri( $user_id ) {
+
+        // Try to get the URI stored in the user's meta and return it if available.
+        if ( false !== ( $user_uri = $this->_get_uri( $user_id ) ) ) {
+            return $user_uri;
+        }
+
+        // Try to build an URI, return false in case of failure.
+        if ( false === ( $user_uri = $this->_build_uri( $user_id ) ) ) {
+            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.
+     *
+     * @since 3.14.0
+     *
+     * @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.
+     */
+    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}.
+     *
+     * @since 3.14.0
+     *
+     * @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
+     */
+    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.
+     *
+     * @since 3.1.7
+     *
+     * @param int $user_id The user id.
+     *
+     * @return false|string The user's URI or false if not found.
+     */
+    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.
+     *
+     * @since 3.1.7
+     *
+     * @param int $user_id The user's id.
+     *
+     * @return false|string The user's URI or false in case of failure.
+     */
+    private function _build_uri( $user_id ) {
+
+        // Get the user, return false in case of failure.
+        if ( false === ( $user = get_userdata( $user_id ) ) ) {
+            return false;
+        };
+
+        // If the nicename is not set, return a failure.
+        if ( empty( $user->user_nicename ) ) {
+            return false;
+        }
+
+        return wl_configuration_get_redlink_dataset_uri() . "/user/$user->user_nicename";
+    }
+
+    /**
+     * Store the URI in user's meta.
+     *
+     * @since 3.1.7
+     *
+     * @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.
+     */
+    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
+     *
+     * @since 3.14.0
+     *
+     * @param integer $user_id The ID of the user
+     */
+    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
+     *
+     * @since 3.14.0
+     *
+     * @param integer $user_id The ID of the user
+     */
+    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.
+     *
+     * @since 3.14.0
+     *
+     * @param int $user_id The {@link WP_User} `id`.
+     *
+     * @return int bool True if editing is denied otherwise false.
+     */
+    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.
+     *
+     * @since 3.14.0
+     *
+     * @param int $user_id The {@link WP_User} `id`.
+     *
+     * @return bool True if the {@link WP_User} is an editor otherwise false.
+     */
+    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 );
+    }
+
+    /**
+     * Check if an editor can create entities.
+     *
+     * @since 3.14.0
+     *
+     * @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.
+     */
+    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.
+     *
+     * @since 3.14.0
+     *
+     * @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.
+     */
+    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;
-	}
-
-	/**
-	 * Hook on update user meta to check if the user author has changed.
-	 * If so we need to execute sparql query that will update all user posts author triple.
-	 *
-	 * @since   3.18.0
-	 *
-	 * @param   null   $null
-	 * @param   int    $object_id The user ID.
-	 * @param   string $meta_key The meta key name.
-	 * @param   mixed  $meta_value Meta value.
-	 * @param   mixed  $prev_value The previous metadata value.
-	 *
-	 * @return  null Null if the `meta_key` is not `Wordlift_User_Service::ENTITY_META_KEY`
-	 *                or if the author has not changed.
-	 */
-	public function update_user_metadata( $null, $object_id, $meta_key, $meta_value, $prev_value ) {
-		// Bail if the meta key is not the author meta.
-		if ( $meta_key !== Wordlift_User_Service::ENTITY_META_KEY ) {
-			return null;
-		}
-
-		// Check whether the user is associated with any of the existing publishers/
-		$entity_id = $this->get_entity( $object_id );
-
-		if ( false === $entity_id ) {
-			// An error occurred.
-			$this->log_service->error( "An error occurred: entity_id can't be false." );
-
-			return;
-		}
-
-		// Get the old uri if the entity is set..
-		$old_uri = ! empty( $entity_id )
-			? $this->entity_service->get_uri( $entity_id )
-			: $this->get_uri( $object_id );
-
-		// Get the new user uri's.
-		$new_uri = $this->entity_service->get_uri( $meta_value );
-
-		// Bail if the uri is the same.
-		if ( $old_uri === $new_uri ) {
-			return null;
-		}
-
-		$this->update_author( $old_uri, $new_uri );
-	}
-
-	/**
-	 * Hook on delete user meta to execute sparql query
-	 * that will update all user posts author triple.
-	 *
-	 * @since   3.18.0
-	 *
-	 * @param   null   $null
-	 * @param   int    $object_id The user ID.
-	 * @param   string $meta_key The meta key name.
-	 * @param   mixed  $meta_value Meta value.
-	 * @param   bool   $delete_all Whether to delete the matching metadata entries
-	 *                              for all objects.
-	 *
-	 * @return  null Null if the `meta_key` is not `Wordlift_User_Service::ENTITY_META_KEY`
-	 *               or if the author has not changed.
-	 */
-	public function delete_user_metadata( $null, $object_id, $meta_key, $meta_value, $delete_all ) {
-		// Bail if the meta key is not the author meta.
-		if ( $meta_key !== Wordlift_User_Service::ENTITY_META_KEY ) {
-			return null;
-		}
-
-		// Check whether the user is associated with any of the existing publishers/
-		$entity_id = $this->get_entity( $object_id );
-
-		if ( false === $entity_id ) {
-			// An error occurred.
-			$this->log_service->error( "An error occurred: entity_id can't be false." );
-
-			return;
-		}
-
-		// Get the old uri if the entity is set.
-		$old_uri = $this->entity_service->get_uri( $entity_id );
-
-		$new_uri = $this->get_uri( $object_id );
-
-		$this->update_author( $old_uri, $new_uri );
-
-	}
-
-	/**
-	 * Update the schema:author when the user author is changed.
-	 *
-	 * @since   3.18.0
-	 *
-	 * @param   string $old_uri The old uri to remove.
-	 * @param   string $new_uri The new uri to add.
-	 */
-	private function update_author( $old_uri, $new_uri ) {
-		// Bail in case one of the uris is empty.
-		if ( empty( $old_uri ) || empty( $new_uri ) ) {
-			// An error occurred.
-			$this->log_service->error( "An error occurred: old_uri and/or new_uri can't be null." );
-
-			return;
-		}
-
-		// Build the update query.
-		$query = sprintf(
-			'DELETE { ?s <%1$s> <%2$s> } INSERT { ?s <%1$s> <%3$s> } WHERE { ?s <%1$s> <%2$s> }',
-			// Schema:author triple.
-			$this->sparql_service->escape_uri( Wordlift_Query_Builder::SCHEMA_AUTHOR_URI ),
-			// Old author uri to remove,
-			$this->sparql_service->escape_uri( $old_uri ),
-			// New author uri to add,
-			$this->sparql_service->escape_uri( $new_uri )
-		);
-
-		// Execute the query and update the author.
-		$this->sparql_service->execute( $query );
-
-	}
+        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;
+    }
+
+    /**
+     * Hook on update user meta to check if the user author has changed.
+     * If so we need to execute sparql query that will update all user posts author triple.
+     *
+     * @since   3.18.0
+     *
+     * @param   null   $null
+     * @param   int    $object_id The user ID.
+     * @param   string $meta_key The meta key name.
+     * @param   mixed  $meta_value Meta value.
+     * @param   mixed  $prev_value The previous metadata value.
+     *
+     * @return  null Null if the `meta_key` is not `Wordlift_User_Service::ENTITY_META_KEY`
+     *                or if the author has not changed.
+     */
+    public function update_user_metadata( $null, $object_id, $meta_key, $meta_value, $prev_value ) {
+        // Bail if the meta key is not the author meta.
+        if ( $meta_key !== Wordlift_User_Service::ENTITY_META_KEY ) {
+            return null;
+        }
+
+        // Check whether the user is associated with any of the existing publishers/
+        $entity_id = $this->get_entity( $object_id );
+
+        if ( false === $entity_id ) {
+            // An error occurred.
+            $this->log_service->error( "An error occurred: entity_id can't be false." );
+
+            return;
+        }
+
+        // Get the old uri if the entity is set..
+        $old_uri = ! empty( $entity_id )
+            ? $this->entity_service->get_uri( $entity_id )
+            : $this->get_uri( $object_id );
+
+        // Get the new user uri's.
+        $new_uri = $this->entity_service->get_uri( $meta_value );
+
+        // Bail if the uri is the same.
+        if ( $old_uri === $new_uri ) {
+            return null;
+        }
+
+        $this->update_author( $old_uri, $new_uri );
+    }
+
+    /**
+     * Hook on delete user meta to execute sparql query
+     * that will update all user posts author triple.
+     *
+     * @since   3.18.0
+     *
+     * @param   null   $null
+     * @param   int    $object_id The user ID.
+     * @param   string $meta_key The meta key name.
+     * @param   mixed  $meta_value Meta value.
+     * @param   bool   $delete_all Whether to delete the matching metadata entries
+     *                              for all objects.
+     *
+     * @return  null Null if the `meta_key` is not `Wordlift_User_Service::ENTITY_META_KEY`
+     *               or if the author has not changed.
+     */
+    public function delete_user_metadata( $null, $object_id, $meta_key, $meta_value, $delete_all ) {
+        // Bail if the meta key is not the author meta.
+        if ( $meta_key !== Wordlift_User_Service::ENTITY_META_KEY ) {
+            return null;
+        }
+
+        // Check whether the user is associated with any of the existing publishers/
+        $entity_id = $this->get_entity( $object_id );
+
+        if ( false === $entity_id ) {
+            // An error occurred.
+            $this->log_service->error( "An error occurred: entity_id can't be false." );
+
+            return;
+        }
+
+        // Get the old uri if the entity is set.
+        $old_uri = $this->entity_service->get_uri( $entity_id );
+
+        $new_uri = $this->get_uri( $object_id );
+
+        $this->update_author( $old_uri, $new_uri );
+
+    }
+
+    /**
+     * Update the schema:author when the user author is changed.
+     *
+     * @since   3.18.0
+     *
+     * @param   string $old_uri The old uri to remove.
+     * @param   string $new_uri The new uri to add.
+     */
+    private function update_author( $old_uri, $new_uri ) {
+        // Bail in case one of the uris is empty.
+        if ( empty( $old_uri ) || empty( $new_uri ) ) {
+            // An error occurred.
+            $this->log_service->error( "An error occurred: old_uri and/or new_uri can't be null." );
+
+            return;
+        }
+
+        // Build the update query.
+        $query = sprintf(
+            'DELETE { ?s <%1$s> <%2$s> } INSERT { ?s <%1$s> <%3$s> } WHERE { ?s <%1$s> <%2$s> }',
+            // Schema:author triple.
+            $this->sparql_service->escape_uri( Wordlift_Query_Builder::SCHEMA_AUTHOR_URI ),
+            // Old author uri to remove,
+            $this->sparql_service->escape_uri( $old_uri ),
+            // New author uri to add,
+            $this->sparql_service->escape_uri( $new_uri )
+        );
+
+        // Execute the query and update the author.
+        $this->sparql_service->execute( $query );
+
+    }
 
 }

Spacing +75 added lines, -75 removed lines

@@ -84,16 +84,16 @@ 
 	 * @param \Wordlift_Sparql_Service $sparql_service The {@link Wordlift_Sparql_Service} instance.
 	 * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
 	 */
-	public function __construct( $sparql_service, $entity_service ) {
+	public function __construct($sparql_service, $entity_service) {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_User_Service' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_User_Service');
 
 		self::$instance = $this;
 
 		$this->sparql_service = $sparql_service;
 		$this->entity_service = $entity_service;
 
-		add_filter( 'user_has_cap', array( $this, 'has_cap' ), 10, 3 );
+		add_filter('user_has_cap', array($this, 'has_cap'), 10, 3);
 	}
 
 	/**
@@ -116,20 +116,20 @@ 
 	 *
 	 * @return false|string The user's URI or false in case of failure.
 	 */
-	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.
-		if ( false !== ( $user_uri = $this->_get_uri( $user_id ) ) ) {
+		if (false !== ($user_uri = $this->_get_uri($user_id))) {
 			return $user_uri;
 		}
 
 		// Try to build an URI, return false in case of failure.
-		if ( false === ( $user_uri = $this->_build_uri( $user_id ) ) ) {
+		if (false === ($user_uri = $this->_build_uri($user_id))) {
 			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;
 	}
@@ -146,11 +146,11 @@ 
 	 *
 	 * @return bool|int  Meta ID if the key didn't exist, true on successful update, false on failure.
 	 */
-	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);
 	}
 
 	/**
@@ -162,9 +162,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
 	 */
-	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);
 	}
 
 	/**
@@ -176,11 +176,11 @@ 
 	 *
 	 * @return false|string The user's URI or false if not found.
 	 */
-	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;
 		}
 
@@ -196,19 +196,19 @@ 
 	 *
 	 * @return false|string The user's URI or false in case of failure.
 	 */
-	private function _build_uri( $user_id ) {
+	private function _build_uri($user_id) {
 
 		// Get the user, return false in case of failure.
-		if ( false === ( $user = get_userdata( $user_id ) ) ) {
+		if (false === ($user = get_userdata($user_id))) {
 			return false;
 		};
 
 		// If the nicename is not set, return a failure.
-		if ( empty( $user->user_nicename ) ) {
+		if (empty($user->user_nicename)) {
 			return false;
 		}
 
-		return wl_configuration_get_redlink_dataset_uri() . "/user/$user->user_nicename";
+		return wl_configuration_get_redlink_dataset_uri()."/user/$user->user_nicename";
 	}
 
 	/**
@@ -221,9 +221,9 @@ 
 	 *
 	 * @return int|bool Meta ID if the key didn't exist, true on successful update, false on failure.
 	 */
-	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);
 	}
 
 	/**
@@ -234,15 +234,15 @@ 
 	 *
 	 * @param integer $user_id The ID of the user
 	 */
-	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');
 
 	}
 
@@ -254,15 +254,15 @@ 
 	 *
 	 * @param integer $user_id The ID of the user
 	 */
-	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);
 
 	}
 
@@ -275,9 +275,9 @@ 
 	 *
 	 * @return int bool True if editing is denied otherwise false.
 	 */
-	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);
 	}
 
 	/**
@@ -290,13 +290,13 @@ 
 	 *
 	 * @return bool True if the {@link WP_User} is an editor otherwise false.
 	 */
-	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 );
+		return is_a($user, 'WP_User') && in_array('editor', (array) $user->roles);
 	}
 
 	/**
@@ -308,15 +308,15 @@ 
 	 *
 	 * @return bool    false if it is an editor that is denied from edit entities, true otherwise.
 	 */
-	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);
 	}
 
 	/**
@@ -334,7 +334,7 @@ 
 	 *
 	 * @return array The capabilities array.
 	 */
-	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)
@@ -345,26 +345,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;
 			}
 		}
 
@@ -386,36 +386,36 @@ 
 	 * @return  null Null if the `meta_key` is not `Wordlift_User_Service::ENTITY_META_KEY`
 	 *                or if the author has not changed.
 	 */
-	public function update_user_metadata( $null, $object_id, $meta_key, $meta_value, $prev_value ) {
+	public function update_user_metadata($null, $object_id, $meta_key, $meta_value, $prev_value) {
 		// Bail if the meta key is not the author meta.
-		if ( $meta_key !== Wordlift_User_Service::ENTITY_META_KEY ) {
+		if ($meta_key !== Wordlift_User_Service::ENTITY_META_KEY) {
 			return null;
 		}
 
 		// Check whether the user is associated with any of the existing publishers/
-		$entity_id = $this->get_entity( $object_id );
+		$entity_id = $this->get_entity($object_id);
 
-		if ( false === $entity_id ) {
+		if (false === $entity_id) {
 			// An error occurred.
-			$this->log_service->error( "An error occurred: entity_id can't be false." );
+			$this->log_service->error("An error occurred: entity_id can't be false.");
 
 			return;
 		}
 
 		// Get the old uri if the entity is set..
-		$old_uri = ! empty( $entity_id )
-			? $this->entity_service->get_uri( $entity_id )
-			: $this->get_uri( $object_id );
+		$old_uri = ! empty($entity_id)
+			? $this->entity_service->get_uri($entity_id)
+			: $this->get_uri($object_id);
 
 		// Get the new user uri's.
-		$new_uri = $this->entity_service->get_uri( $meta_value );
+		$new_uri = $this->entity_service->get_uri($meta_value);
 
 		// Bail if the uri is the same.
-		if ( $old_uri === $new_uri ) {
+		if ($old_uri === $new_uri) {
 			return null;
 		}
 
-		$this->update_author( $old_uri, $new_uri );
+		$this->update_author($old_uri, $new_uri);
 	}
 
 	/**
@@ -434,28 +434,28 @@ 
 	 * @return  null Null if the `meta_key` is not `Wordlift_User_Service::ENTITY_META_KEY`
 	 *               or if the author has not changed.
 	 */
-	public function delete_user_metadata( $null, $object_id, $meta_key, $meta_value, $delete_all ) {
+	public function delete_user_metadata($null, $object_id, $meta_key, $meta_value, $delete_all) {
 		// Bail if the meta key is not the author meta.
-		if ( $meta_key !== Wordlift_User_Service::ENTITY_META_KEY ) {
+		if ($meta_key !== Wordlift_User_Service::ENTITY_META_KEY) {
 			return null;
 		}
 
 		// Check whether the user is associated with any of the existing publishers/
-		$entity_id = $this->get_entity( $object_id );
+		$entity_id = $this->get_entity($object_id);
 
-		if ( false === $entity_id ) {
+		if (false === $entity_id) {
 			// An error occurred.
-			$this->log_service->error( "An error occurred: entity_id can't be false." );
+			$this->log_service->error("An error occurred: entity_id can't be false.");
 
 			return;
 		}
 
 		// Get the old uri if the entity is set.
-		$old_uri = $this->entity_service->get_uri( $entity_id );
+		$old_uri = $this->entity_service->get_uri($entity_id);
 
-		$new_uri = $this->get_uri( $object_id );
+		$new_uri = $this->get_uri($object_id);
 
-		$this->update_author( $old_uri, $new_uri );
+		$this->update_author($old_uri, $new_uri);
 
 	}
 
@@ -467,11 +467,11 @@ 
 	 * @param   string $old_uri The old uri to remove.
 	 * @param   string $new_uri The new uri to add.
 	 */
-	private function update_author( $old_uri, $new_uri ) {
+	private function update_author($old_uri, $new_uri) {
 		// Bail in case one of the uris is empty.
-		if ( empty( $old_uri ) || empty( $new_uri ) ) {
+		if (empty($old_uri) || empty($new_uri)) {
 			// An error occurred.
-			$this->log_service->error( "An error occurred: old_uri and/or new_uri can't be null." );
+			$this->log_service->error("An error occurred: old_uri and/or new_uri can't be null.");
 
 			return;
 		}
@@ -480,15 +480,15 @@ 
 		$query = sprintf(
 			'DELETE { ?s <%1$s> <%2$s> } INSERT { ?s <%1$s> <%3$s> } WHERE { ?s <%1$s> <%2$s> }',
 			// Schema:author triple.
-			$this->sparql_service->escape_uri( Wordlift_Query_Builder::SCHEMA_AUTHOR_URI ),
+			$this->sparql_service->escape_uri(Wordlift_Query_Builder::SCHEMA_AUTHOR_URI),
 			// Old author uri to remove,
-			$this->sparql_service->escape_uri( $old_uri ),
+			$this->sparql_service->escape_uri($old_uri),
 			// New author uri to add,
-			$this->sparql_service->escape_uri( $new_uri )
+			$this->sparql_service->escape_uri($new_uri)
 		);
 
 		// Execute the query and update the author.
-		$this->sparql_service->execute( $query );
+		$this->sparql_service->execute($query);
 
 	}
 

src/admin/class-wordlift-admin-user-profile-page.php

Indentation +119 added lines, -119 removed lines

@@ -18,75 +18,75 @@ 
  */
 class Wordlift_Admin_User_Profile_Page {
 
-	/**
-	 * The {@link Wordlift_Admin_Person_Element} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Admin_Author_Element $plugin The person entity
-	 *                selection element rendering the possible persons.
-	 */
-	private $author_element;
-
-	/**
-	 * The {@link Wordlift_User_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
-	 */
-	private $user_service;
-
-	/**
-	 * Create the {@link Wordlift_Admin_User_Profile_Page} instance.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param \Wordlift_Admin_Author_Element $author_element The person entity selection
-	 *                                                       element rendering the possible persons.
-	 * @param \Wordlift_User_Service         $user_service   The {@link Wordlift_User_Service} instance.
-	 */
-	function __construct( $author_element, $user_service ) {
-
-		$this->author_element = $author_element;
-		$this->user_service   = $user_service;
-
-		/*
+    /**
+     * The {@link Wordlift_Admin_Person_Element} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Admin_Author_Element $plugin The person entity
+     *                selection element rendering the possible persons.
+     */
+    private $author_element;
+
+    /**
+     * The {@link Wordlift_User_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
+     */
+    private $user_service;
+
+    /**
+     * Create the {@link Wordlift_Admin_User_Profile_Page} instance.
+     *
+     * @since 3.14.0
+     *
+     * @param \Wordlift_Admin_Author_Element $author_element The person entity selection
+     *                                                       element rendering the possible persons.
+     * @param \Wordlift_User_Service         $user_service   The {@link Wordlift_User_Service} instance.
+     */
+    function __construct( $author_element, $user_service ) {
+
+        $this->author_element = $author_element;
+        $this->user_service   = $user_service;
+
+        /*
 		 * When an admin (or similar permissions) edits his own profile a
 		 * different action than the usual is being triggered.
 		 * It is too early in the wordpress boot to do user capabilities filtering
 		 * here and it is deferred to the handler.
 		 */
-		add_action( 'show_user_profile', array( $this, 'edit_user_profile' ) );
-		add_action( 'edit_user_profile', array( $this, 'edit_user_profile' ) );
-		add_action( 'edit_user_profile_update', array(
-			$this,
-			'edit_user_profile_update',
-		) );
-		add_action( 'personal_options_update', array(
-			$this,
-			'edit_user_profile_update',
-		) );
-
-	}
-
-	/**
-	 * Add a WordLift section in the user profile which lets
-	 * the admin to associate a wordpress user with a person entity.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param WP_User $user The current WP_User object of the user being edited.
-	 */
-	public function edit_user_profile( $user ) {
-
-		// In case it is a user editing his own profile, make sure he has admin
-		// like capabilities.
-		if ( ! current_user_can( 'edit_users' ) ) {
-			return;
-		}
-
-		?>
+        add_action( 'show_user_profile', array( $this, 'edit_user_profile' ) );
+        add_action( 'edit_user_profile', array( $this, 'edit_user_profile' ) );
+        add_action( 'edit_user_profile_update', array(
+            $this,
+            'edit_user_profile_update',
+        ) );
+        add_action( 'personal_options_update', array(
+            $this,
+            'edit_user_profile_update',
+        ) );
+
+    }
+
+    /**
+     * Add a WordLift section in the user profile which lets
+     * the admin to associate a wordpress user with a person entity.
+     *
+     * @since 3.14.0
+     *
+     * @param WP_User $user The current WP_User object of the user being edited.
+     */
+    public function edit_user_profile( $user ) {
+
+        // In case it is a user editing his own profile, make sure he has admin
+        // like capabilities.
+        if ( ! current_user_can( 'edit_users' ) ) {
+            return;
+        }
+
+        ?>
 		<h2><?php esc_html_e( 'WordLift', 'wordlift' ); ?></h2>
 
 		<table class="form-table">
@@ -96,12 +96,12 @@ 
 				</th>
 				<td>
 					<?php
-					$this->author_element->render( array(
-						'id'             => 'wl_person',
-						'name'           => 'wl_person',
-						'current_entity' => $this->user_service->get_entity( $user->ID ),
-					) );
-					?>
+                    $this->author_element->render( array(
+                        'id'             => 'wl_person',
+                        'name'           => 'wl_person',
+                        'current_entity' => $this->user_service->get_entity( $user->ID ),
+                    ) );
+                    ?>
 					<p class="description"><?php _e( 'The entity, person or organization, from the vocabulary to associate with this author.', 'wordlift' ); ?></p>
 				</td>
 			</tr>
@@ -119,54 +119,54 @@ 
 				<?php } ?>
 		</table>
 		<?php
-	}
-
-	/**
-	 * Handle storing the person entity associated with the user.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param int $user_id The user id of the user being saved.
-	 */
-	public function edit_user_profile_update( $user_id ) {
-
-		// In case it is a user editing his own profile, make sure he has admin
-		// like capabilities.
-		if ( ! current_user_can( 'edit_users' ) ) {
-			return;
-		}
-
-		// Link an entity to the user.
-		$this->link_entity( $user_id, $_POST );
-
-		// Deny and enable the edit entity capability
-		if ( isset( $_POST['wl_can_create_entities'] ) ) {
-			// User has capability so remove the deny indication if present.
-			$this->user_service->allow_editor_entity_create( $user_id );
-		} else {
-			$this->user_service->deny_editor_entity_create( $user_id );
-		}
-
-	}
-
-	/**
-	 * Link an entity (specified in the `$_POST` array) to the {@link WP_User}
-	 * with the specified `id`.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param int   $user_id The {@link WP_User} `id`.
-	 * @param array $post    The `$_POST` array.
-	 */
-	private function link_entity( $user_id, $post ) {
-
-		// Bail out if the `wl_person` parameter isn't set.
-		if ( ! isset( $post['wl_person'] ) || ! is_numeric( $post['wl_person'] ) ) {
-			return;
-		}
-
-		$this->user_service->set_entity( $user_id, intval( $post['wl_person'] ) );
-
-	}
+    }
+
+    /**
+     * Handle storing the person entity associated with the user.
+     *
+     * @since 3.14.0
+     *
+     * @param int $user_id The user id of the user being saved.
+     */
+    public function edit_user_profile_update( $user_id ) {
+
+        // In case it is a user editing his own profile, make sure he has admin
+        // like capabilities.
+        if ( ! current_user_can( 'edit_users' ) ) {
+            return;
+        }
+
+        // Link an entity to the user.
+        $this->link_entity( $user_id, $_POST );
+
+        // Deny and enable the edit entity capability
+        if ( isset( $_POST['wl_can_create_entities'] ) ) {
+            // User has capability so remove the deny indication if present.
+            $this->user_service->allow_editor_entity_create( $user_id );
+        } else {
+            $this->user_service->deny_editor_entity_create( $user_id );
+        }
+
+    }
+
+    /**
+     * Link an entity (specified in the `$_POST` array) to the {@link WP_User}
+     * with the specified `id`.
+     *
+     * @since 3.14.0
+     *
+     * @param int   $user_id The {@link WP_User} `id`.
+     * @param array $post    The `$_POST` array.
+     */
+    private function link_entity( $user_id, $post ) {
+
+        // Bail out if the `wl_person` parameter isn't set.
+        if ( ! isset( $post['wl_person'] ) || ! is_numeric( $post['wl_person'] ) ) {
+            return;
+        }
+
+        $this->user_service->set_entity( $user_id, intval( $post['wl_person'] ) );
+
+    }
 
 }

Spacing +27 added lines, -27 removed lines

@@ -46,7 +46,7 @@ 
 	 *                                                       element rendering the possible persons.
 	 * @param \Wordlift_User_Service         $user_service   The {@link Wordlift_User_Service} instance.
 	 */
-	function __construct( $author_element, $user_service ) {
+	function __construct($author_element, $user_service) {
 
 		$this->author_element = $author_element;
 		$this->user_service   = $user_service;
@@ -57,16 +57,16 @@ 
 		 * It is too early in the wordpress boot to do user capabilities filtering
 		 * here and it is deferred to the handler.
 		 */
-		add_action( 'show_user_profile', array( $this, 'edit_user_profile' ) );
-		add_action( 'edit_user_profile', array( $this, 'edit_user_profile' ) );
-		add_action( 'edit_user_profile_update', array(
+		add_action('show_user_profile', array($this, 'edit_user_profile'));
+		add_action('edit_user_profile', array($this, 'edit_user_profile'));
+		add_action('edit_user_profile_update', array(
 			$this,
 			'edit_user_profile_update',
-		) );
-		add_action( 'personal_options_update', array(
+		));
+		add_action('personal_options_update', array(
 			$this,
 			'edit_user_profile_update',
-		) );
+		));
 
 	}
 
@@ -78,43 +78,43 @@ 
 	 *
 	 * @param WP_User $user The current WP_User object of the user being edited.
 	 */
-	public function edit_user_profile( $user ) {
+	public function edit_user_profile($user) {
 
 		// In case it is a user editing his own profile, make sure he has admin
 		// like capabilities.
-		if ( ! current_user_can( 'edit_users' ) ) {
+		if ( ! current_user_can('edit_users')) {
 			return;
 		}
 
 		?>
-		<h2><?php esc_html_e( 'WordLift', 'wordlift' ); ?></h2>
+		<h2><?php esc_html_e('WordLift', 'wordlift'); ?></h2>
 
 		<table class="form-table">
 			<tr class="user-description-wrap">
 				<th><label
-						for="wl_person"><?php _e( 'Author from the vocabulary', 'wordlift' ); ?></label>
+						for="wl_person"><?php _e('Author from the vocabulary', 'wordlift'); ?></label>
 				</th>
 				<td>
 					<?php
-					$this->author_element->render( array(
+					$this->author_element->render(array(
 						'id'             => 'wl_person',
 						'name'           => 'wl_person',
-						'current_entity' => $this->user_service->get_entity( $user->ID ),
-					) );
+						'current_entity' => $this->user_service->get_entity($user->ID),
+					));
 					?>
-					<p class="description"><?php _e( 'The entity, person or organization, from the vocabulary to associate with this author.', 'wordlift' ); ?></p>
+					<p class="description"><?php _e('The entity, person or organization, from the vocabulary to associate with this author.', 'wordlift'); ?></p>
 				</td>
 			</tr>
-			<?php if ( $this->user_service->is_editor( $user->ID ) ) { ?>
+			<?php if ($this->user_service->is_editor($user->ID)) { ?>
 			<tr>
 				<th>
 					<label
-						for="wl_can_create_entities"><?php esc_html_e( 'Can create new entities', 'wordlift' ) ?></label>
+						for="wl_can_create_entities"><?php esc_html_e('Can create new entities', 'wordlift') ?></label>
 				</th>
 				<td>
 					<input id="wl_can_create_entities"
 					       name="wl_can_create_entities"
-					       type="checkbox" <?php checked( $this->user_service->editor_can_create_entities( $user->ID ) ) ?>
+					       type="checkbox" <?php checked($this->user_service->editor_can_create_entities($user->ID)) ?>
 				</td>
 				<?php } ?>
 		</table>
@@ -128,23 +128,23 @@ 
 	 *
 	 * @param int $user_id The user id of the user being saved.
 	 */
-	public function edit_user_profile_update( $user_id ) {
+	public function edit_user_profile_update($user_id) {
 
 		// In case it is a user editing his own profile, make sure he has admin
 		// like capabilities.
-		if ( ! current_user_can( 'edit_users' ) ) {
+		if ( ! current_user_can('edit_users')) {
 			return;
 		}
 
 		// Link an entity to the user.
-		$this->link_entity( $user_id, $_POST );
+		$this->link_entity($user_id, $_POST);
 
 		// Deny and enable the edit entity capability
-		if ( isset( $_POST['wl_can_create_entities'] ) ) {
+		if (isset($_POST['wl_can_create_entities'])) {
 			// User has capability so remove the deny indication if present.
-			$this->user_service->allow_editor_entity_create( $user_id );
+			$this->user_service->allow_editor_entity_create($user_id);
 		} else {
-			$this->user_service->deny_editor_entity_create( $user_id );
+			$this->user_service->deny_editor_entity_create($user_id);
 		}
 
 	}
@@ -158,14 +158,14 @@ 
 	 * @param int   $user_id The {@link WP_User} `id`.
 	 * @param array $post    The `$_POST` array.
 	 */
-	private function link_entity( $user_id, $post ) {
+	private function link_entity($user_id, $post) {
 
 		// Bail out if the `wl_person` parameter isn't set.
-		if ( ! isset( $post['wl_person'] ) || ! is_numeric( $post['wl_person'] ) ) {
+		if ( ! isset($post['wl_person']) || ! is_numeric($post['wl_person'])) {
 			return;
 		}
 
-		$this->user_service->set_entity( $user_id, intval( $post['wl_person'] ) );
+		$this->user_service->set_entity($user_id, intval($post['wl_person']));
 
 	}