insideout10 / wordlift-plugin

src/cli/class-wordlift-push-reference-data-command.php

Indentation +140 added lines, -140 removed lines

@@ -16,130 +16,130 @@ 
  */
 class Wordlift_Push_Reference_Data_Command {
 
-	/**
-	 * The {@link Wordlift_Relation_Service} instance.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
-	 */
-	private $relation_service;
-
-	/**
-	 * The {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * 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 {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-	/**
-	 * @var Wordlift_Entity_Type_Service
-	 */
-	private $entity_type_service;
-
-	/**
-	 * Wordlift_Push_Reference_Data_Command constructor.
-	 *
-	 * @since 3.18.0
-	 *
-	 * @param \Wordlift_Relation_Service      $relation_service The {@link Wordlift_Relation_Service} instance.
-	 * @param \Wordlift_Entity_Service        $entity_service The {@link Wordlift_Entity_Service} instance.
-	 * @param \Wordlift_Sparql_Service        $sparql_service The {@link Wordlift_Sparql_Service} instance.
-	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 * @param \Wordlift_Entity_Type_Service   $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
-	 */
-	public function __construct( $relation_service, $entity_service, $sparql_service, $configuration_service, $entity_type_service ) {
-
-		$this->relation_service      = $relation_service;
-		$this->entity_service        = $entity_service;
-		$this->sparql_service        = $sparql_service;
-		$this->configuration_service = $configuration_service;
-		$this->entity_type_service   = $entity_type_service;
-
-	}
-
-	public function __invoke( $args ) {
-
-		$relations    = $this->relation_service->find_all_grouped_by_subject_id();
-		$progress_bar = \WP_CLI\Utils\make_progress_bar( 'Processing...', count( $relations ) );
-
-		foreach ( $relations as $relation ) {
-			$progress_bar->tick();
-
-			// Get the post.
-			$post = get_post( $relation->subject_id );
-
-			// Bail out if the post isn't found.
-			if ( null == $post ) {
-				continue;
-			}
-
-			// Bail out if it's an entity: we're only interested in articles
-			// *referencing* entities.
-			if ( $this->entity_service->is_entity( $post->ID ) ) {
-				continue;
-			}
-
-			// Get the article URI.
-			$uri = $this->entity_service->get_uri( $post->ID );
-
-			// Prepare the DELETE query to delete existing data.
-			$query = self::get_delete_query( $uri )
-			         . $this->get_insert_query( $post, $uri, explode( ',', $relation->object_ids ) );
-
-			$this->sparql_service->execute( $query, false );
-
-		}
-
-		$progress_bar->finish();
-
-	}
-
-	private static function get_delete_query( $uri ) {
-
-		return Wordlift_Query_Builder
-			       ::new_instance()
-			       ->delete()->statement( $uri, Wordlift_Query_Builder::DCTERMS_REFERENCES_URI, '?o' )
-			       ->build()
-		       . Wordlift_Query_Builder
-			       ::new_instance()
-			       ->delete()->statement( $uri, Wordlift_Query_Builder::RDFS_TYPE_URI, '?o' )
-			       ->build()
-		       . Wordlift_Query_Builder
-			       ::new_instance()
-			       ->delete()->statement( $uri, Wordlift_Query_Builder::SCHEMA_HEADLINE_URI, '?o' )
-			       ->build()
-		       . Wordlift_Query_Builder
-			       ::new_instance()
-			       ->delete()->statement( $uri, Wordlift_Query_Builder::SCHEMA_URL_URI, '?o' )
-			       ->build();
-	}
-
-	private function get_insert_query( $post, $uri, $object_ids ) {
-
-		$language_code = $this->configuration_service->get_language_code();
-		$type          = $this->entity_type_service->get( $post->ID );
-
-		/*
+    /**
+     * The {@link Wordlift_Relation_Service} instance.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
+     */
+    private $relation_service;
+
+    /**
+     * The {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+
+    /**
+     * 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 {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+    /**
+     * @var Wordlift_Entity_Type_Service
+     */
+    private $entity_type_service;
+
+    /**
+     * Wordlift_Push_Reference_Data_Command constructor.
+     *
+     * @since 3.18.0
+     *
+     * @param \Wordlift_Relation_Service      $relation_service The {@link Wordlift_Relation_Service} instance.
+     * @param \Wordlift_Entity_Service        $entity_service The {@link Wordlift_Entity_Service} instance.
+     * @param \Wordlift_Sparql_Service        $sparql_service The {@link Wordlift_Sparql_Service} instance.
+     * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     * @param \Wordlift_Entity_Type_Service   $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
+     */
+    public function __construct( $relation_service, $entity_service, $sparql_service, $configuration_service, $entity_type_service ) {
+
+        $this->relation_service      = $relation_service;
+        $this->entity_service        = $entity_service;
+        $this->sparql_service        = $sparql_service;
+        $this->configuration_service = $configuration_service;
+        $this->entity_type_service   = $entity_type_service;
+
+    }
+
+    public function __invoke( $args ) {
+
+        $relations    = $this->relation_service->find_all_grouped_by_subject_id();
+        $progress_bar = \WP_CLI\Utils\make_progress_bar( 'Processing...', count( $relations ) );
+
+        foreach ( $relations as $relation ) {
+            $progress_bar->tick();
+
+            // Get the post.
+            $post = get_post( $relation->subject_id );
+
+            // Bail out if the post isn't found.
+            if ( null == $post ) {
+                continue;
+            }
+
+            // Bail out if it's an entity: we're only interested in articles
+            // *referencing* entities.
+            if ( $this->entity_service->is_entity( $post->ID ) ) {
+                continue;
+            }
+
+            // Get the article URI.
+            $uri = $this->entity_service->get_uri( $post->ID );
+
+            // Prepare the DELETE query to delete existing data.
+            $query = self::get_delete_query( $uri )
+                        . $this->get_insert_query( $post, $uri, explode( ',', $relation->object_ids ) );
+
+            $this->sparql_service->execute( $query, false );
+
+        }
+
+        $progress_bar->finish();
+
+    }
+
+    private static function get_delete_query( $uri ) {
+
+        return Wordlift_Query_Builder
+                    ::new_instance()
+                    ->delete()->statement( $uri, Wordlift_Query_Builder::DCTERMS_REFERENCES_URI, '?o' )
+                    ->build()
+                . Wordlift_Query_Builder
+                    ::new_instance()
+                    ->delete()->statement( $uri, Wordlift_Query_Builder::RDFS_TYPE_URI, '?o' )
+                    ->build()
+                . Wordlift_Query_Builder
+                    ::new_instance()
+                    ->delete()->statement( $uri, Wordlift_Query_Builder::SCHEMA_HEADLINE_URI, '?o' )
+                    ->build()
+                . Wordlift_Query_Builder
+                    ::new_instance()
+                    ->delete()->statement( $uri, Wordlift_Query_Builder::SCHEMA_URL_URI, '?o' )
+                    ->build();
+    }
+
+    private function get_insert_query( $post, $uri, $object_ids ) {
+
+        $language_code = $this->configuration_service->get_language_code();
+        $type          = $this->entity_type_service->get( $post->ID );
+
+        /*
 		 * When inserting the schema:url property in the triple store, we want to use the production
 		 * URL, i.e. we must take into consideration that the current URL is a staging one and that
 		 * 3rd parties may want to update the URL with a production one.
@@ -148,21 +148,21 @@ 
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/850.
 		 */
-		$permalink = Wordlift_Post_Adapter::get_production_permalink( $post->ID );
-		$builder   = Wordlift_Query_Builder
-			::new_instance()
-			->insert()
-			->statement( $uri, Wordlift_Query_Builder::SCHEMA_HEADLINE_URI, $post->post_title, Wordlift_Query_Builder::OBJECT_VALUE, null, $language_code )
-			->statement( $uri, Wordlift_Query_Builder::SCHEMA_URL_URI, $permalink )
-			->statement( $uri, Wordlift_Query_Builder::RDFS_TYPE_URI, $type['uri'] );
-
-		$entity_service = $this->entity_service;
-		array_walk( $object_ids, function ( $item ) use ( $entity_service, $builder, $uri ) {
-			$object_uri = $entity_service->get_uri( $item );
-			$builder->statement( $uri, Wordlift_Query_Builder::DCTERMS_REFERENCES_URI, $object_uri );
-		} );
-
-		return $builder->build();
-	}
+        $permalink = Wordlift_Post_Adapter::get_production_permalink( $post->ID );
+        $builder   = Wordlift_Query_Builder
+            ::new_instance()
+            ->insert()
+            ->statement( $uri, Wordlift_Query_Builder::SCHEMA_HEADLINE_URI, $post->post_title, Wordlift_Query_Builder::OBJECT_VALUE, null, $language_code )
+            ->statement( $uri, Wordlift_Query_Builder::SCHEMA_URL_URI, $permalink )
+            ->statement( $uri, Wordlift_Query_Builder::RDFS_TYPE_URI, $type['uri'] );
+
+        $entity_service = $this->entity_service;
+        array_walk( $object_ids, function ( $item ) use ( $entity_service, $builder, $uri ) {
+            $object_uri = $entity_service->get_uri( $item );
+            $builder->statement( $uri, Wordlift_Query_Builder::DCTERMS_REFERENCES_URI, $object_uri );
+        } );
+
+        return $builder->build();
+    }
 
 }

Spacing +25 added lines, -25 removed lines

@@ -67,7 +67,7 @@ 
 	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
 	 * @param \Wordlift_Entity_Type_Service   $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
 	 */
-	public function __construct( $relation_service, $entity_service, $sparql_service, $configuration_service, $entity_type_service ) {
+	public function __construct($relation_service, $entity_service, $sparql_service, $configuration_service, $entity_type_service) {
 
 		$this->relation_service      = $relation_service;
 		$this->entity_service        = $entity_service;
@@ -77,36 +77,36 @@ 
 
 	}
 
-	public function __invoke( $args ) {
+	public function __invoke($args) {
 
 		$relations    = $this->relation_service->find_all_grouped_by_subject_id();
-		$progress_bar = \WP_CLI\Utils\make_progress_bar( 'Processing...', count( $relations ) );
+		$progress_bar = \WP_CLI\Utils\make_progress_bar('Processing...', count($relations));
 
-		foreach ( $relations as $relation ) {
+		foreach ($relations as $relation) {
 			$progress_bar->tick();
 
 			// Get the post.
-			$post = get_post( $relation->subject_id );
+			$post = get_post($relation->subject_id);
 
 			// Bail out if the post isn't found.
-			if ( null == $post ) {
+			if (null == $post) {
 				continue;
 			}
 
 			// Bail out if it's an entity: we're only interested in articles
 			// *referencing* entities.
-			if ( $this->entity_service->is_entity( $post->ID ) ) {
+			if ($this->entity_service->is_entity($post->ID)) {
 				continue;
 			}
 
 			// Get the article URI.
-			$uri = $this->entity_service->get_uri( $post->ID );
+			$uri = $this->entity_service->get_uri($post->ID);
 
 			// Prepare the DELETE query to delete existing data.
-			$query = self::get_delete_query( $uri )
-			         . $this->get_insert_query( $post, $uri, explode( ',', $relation->object_ids ) );
+			$query = self::get_delete_query($uri)
+			         . $this->get_insert_query($post, $uri, explode(',', $relation->object_ids));
 
-			$this->sparql_service->execute( $query, false );
+			$this->sparql_service->execute($query, false);
 
 		}
 
@@ -114,30 +114,30 @@ 
 
 	}
 
-	private static function get_delete_query( $uri ) {
+	private static function get_delete_query($uri) {
 
 		return Wordlift_Query_Builder
 			       ::new_instance()
-			       ->delete()->statement( $uri, Wordlift_Query_Builder::DCTERMS_REFERENCES_URI, '?o' )
+			       ->delete()->statement($uri, Wordlift_Query_Builder::DCTERMS_REFERENCES_URI, '?o')
 			       ->build()
 		       . Wordlift_Query_Builder
 			       ::new_instance()
-			       ->delete()->statement( $uri, Wordlift_Query_Builder::RDFS_TYPE_URI, '?o' )
+			       ->delete()->statement($uri, Wordlift_Query_Builder::RDFS_TYPE_URI, '?o')
 			       ->build()
 		       . Wordlift_Query_Builder
 			       ::new_instance()
-			       ->delete()->statement( $uri, Wordlift_Query_Builder::SCHEMA_HEADLINE_URI, '?o' )
+			       ->delete()->statement($uri, Wordlift_Query_Builder::SCHEMA_HEADLINE_URI, '?o')
 			       ->build()
 		       . Wordlift_Query_Builder
 			       ::new_instance()
-			       ->delete()->statement( $uri, Wordlift_Query_Builder::SCHEMA_URL_URI, '?o' )
+			       ->delete()->statement($uri, Wordlift_Query_Builder::SCHEMA_URL_URI, '?o')
 			       ->build();
 	}
 
-	private function get_insert_query( $post, $uri, $object_ids ) {
+	private function get_insert_query($post, $uri, $object_ids) {
 
 		$language_code = $this->configuration_service->get_language_code();
-		$type          = $this->entity_type_service->get( $post->ID );
+		$type          = $this->entity_type_service->get($post->ID);
 
 		/*
 		 * When inserting the schema:url property in the triple store, we want to use the production
@@ -148,18 +148,18 @@ 
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/850.
 		 */
-		$permalink = Wordlift_Post_Adapter::get_production_permalink( $post->ID );
+		$permalink = Wordlift_Post_Adapter::get_production_permalink($post->ID);
 		$builder   = Wordlift_Query_Builder
 			::new_instance()
 			->insert()
-			->statement( $uri, Wordlift_Query_Builder::SCHEMA_HEADLINE_URI, $post->post_title, Wordlift_Query_Builder::OBJECT_VALUE, null, $language_code )
-			->statement( $uri, Wordlift_Query_Builder::SCHEMA_URL_URI, $permalink )
-			->statement( $uri, Wordlift_Query_Builder::RDFS_TYPE_URI, $type['uri'] );
+			->statement($uri, Wordlift_Query_Builder::SCHEMA_HEADLINE_URI, $post->post_title, Wordlift_Query_Builder::OBJECT_VALUE, null, $language_code)
+			->statement($uri, Wordlift_Query_Builder::SCHEMA_URL_URI, $permalink)
+			->statement($uri, Wordlift_Query_Builder::RDFS_TYPE_URI, $type['uri']);
 
 		$entity_service = $this->entity_service;
-		array_walk( $object_ids, function ( $item ) use ( $entity_service, $builder, $uri ) {
-			$object_uri = $entity_service->get_uri( $item );
-			$builder->statement( $uri, Wordlift_Query_Builder::DCTERMS_REFERENCES_URI, $object_uri );
+		array_walk($object_ids, function($item) use ($entity_service, $builder, $uri) {
+			$object_uri = $entity_service->get_uri($item);
+			$builder->statement($uri, Wordlift_Query_Builder::DCTERMS_REFERENCES_URI, $object_uri);
 		} );
 
 		return $builder->build();

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

Indentation +529 added lines, -529 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -21,533 +21,533 @@ 
  */
 class Wordlift_Configuration_Service {
 
-	/**
-	 * The entity base path option name.
-	 *
-	 * @since 3.6.0
-	 */
-	const ENTITY_BASE_PATH_KEY = 'wl_entity_base_path';
-
-	/**
-	 * The skip wizard (admin installation wizard) option name.
-	 *
-	 * @since 3.9.0
-	 */
-	const SKIP_WIZARD = 'wl_skip_wizard';
-
-	/**
-	 * WordLift's key option name.
-	 *
-	 * @since 3.9.0
-	 */
-	const KEY = 'key';
-
-	/**
-	 * WordLift's configured language option name.
-	 *
-	 * @since 3.9.0
-	 */
-	const LANGUAGE = 'site_language';
-
-	/**
-	 * The publisher entity post ID option name.
-	 *
-	 * @since 3.9.0
-	 */
-	const PUBLISHER_ID = 'publisher_id';
-
-	/**
-	 * The dataset URI option name
-	 *
-	 * @since 3.10.0
-	 */
-	const DATASET_URI = 'redlink_dataset_uri';
-
-	/**
-	 * The link by default option name.
-	 *
-	 * @since 3.11.0
-	 */
-	const LINK_BY_DEFAULT = 'link_by_default';
-
-	/**
-	 * The user preferences about sharing data option.
-	 *
-	 * @since 3.19.0
-	 */
-	const SEND_DIAGNOSTIC = 'send_diagnostic';
-
-	/**
-	 * The {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since 3.16.0
-	 *
-	 * @var \Wordlift_Log_Service $log The {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * The Wordlift_Configuration_Service's singleton instance.
-	 *
-	 * @since  3.6.0
-	 *
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $instance Wordlift_Configuration_Service's singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Create a Wordlift_Configuration_Service's instance.
-	 *
-	 * @since 3.6.0
-	 */
-	public function __construct() {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @return \Wordlift_Configuration_Service
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get a configuration given the option name and a key. The option value is
-	 * expected to be an array.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param string $option The option name.
-	 * @param string $key A key in the option value array.
-	 * @param string $default The default value in case the key is not found (by default an empty string).
-	 *
-	 * @return mixed The configuration value or the default value if not found.
-	 */
-	private function get( $option, $key, $default = '' ) {
-
-		$options = get_option( $option, array() );
-
-		return isset( $options[ $key ] ) ? $options[ $key ] : $default;
-	}
-
-	/**
-	 * Set a configuration parameter.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @param string $option Name of option to retrieve. Expected to not be SQL-escaped.
-	 * @param string $key The value key.
-	 * @param mixed  $value The value.
-	 */
-	private function set( $option, $key, $value ) {
-
-		$values         = get_option( $option );
-		$values         = isset( $values ) ? $values : array();
-		$values[ $key ] = $value;
-		update_option( $option, $values );
-
-	}
-
-	/**
-	 * Get the entity base path, by default 'entity'.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @return string The entity base path.
-	 */
-	public function get_entity_base_path() {
-
-		return $this->get( 'wl_general_settings', self::ENTITY_BASE_PATH_KEY, 'entity' );
-	}
-
-	/**
-	 * Get the entity base path.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @param string $value The entity base path.
-	 */
-	public function set_entity_base_path( $value ) {
-
-		$this->set( 'wl_general_settings', self::ENTITY_BASE_PATH_KEY, $value );
-
-	}
-
-	/**
-	 * Whether the installation skip wizard should be skipped.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @return bool True if it should be skipped otherwise false.
-	 */
-	public function is_skip_wizard() {
-
-		return $this->get( 'wl_general_settings', self::SKIP_WIZARD, false );
-	}
-
-	/**
-	 * Set the skip wizard parameter.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @param bool $value True to skip the wizard. We expect a boolean value.
-	 */
-	public function set_skip_wizard( $value ) {
-
-		$this->set( 'wl_general_settings', self::SKIP_WIZARD, true === $value );
-
-	}
-
-	/**
-	 * Get WordLift's key.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @return string WordLift's key or an empty string if not set.
-	 */
-	public function get_key() {
-
-		return $this->get( 'wl_general_settings', self::KEY, '' );
-	}
-
-	/**
-	 * Set WordLift's key.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @param string $value WordLift's key.
-	 */
-	public function set_key( $value ) {
-
-		$this->set( 'wl_general_settings', self::KEY, $value );
-	}
-
-	/**
-	 * Get WordLift's configured language, by default 'en'.
-	 *
-	 * Note that WordLift's language is used when writing strings to the Linked Data dataset, not for the analysis.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @return string WordLift's configured language code ('en' by default).
-	 */
-	public function get_language_code() {
-
-		return $this->get( 'wl_general_settings', self::LANGUAGE, 'en' );
-	}
-
-	/**
-	 * Set WordLift's language code, used when storing strings to the Linked Data dataset.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @param string $value WordLift's language code.
-	 */
-	public function set_language_code( $value ) {
-
-		$this->set( 'wl_general_settings', self::LANGUAGE, $value );
-
-	}
-
-	/**
-	 * Set the user preferences about sharing diagnostic with us.
-	 *
-	 * @since 3.19.0
-	 *
-	 * @param string $value The user preferences(yes/no).
-	 */
-	public function set_diagnostic_preferences( $value ) {
-
-		$this->set( 'wl_general_settings', self::SEND_DIAGNOSTIC, $value );
-
-	}
-
-	/**
-	 * Get the user preferences about sharing diagnostic.
-	 *
-	 * @since 3.19.0
-	 */
-	public function get_diagnostic_preferences() {
-
-		return $this->get( 'wl_general_settings', self::SEND_DIAGNOSTIC, 'no' );
-
-	}
-
-	/**
-	 * Get the publisher entity post id.
-	 *
-	 * The publisher entity post id points to an entity post which contains the data for the publisher used in schema.org
-	 * Article markup.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @return int|NULL The publisher entity post id or NULL if not set.
-	 */
-	public function get_publisher_id() {
-
-		return $this->get( 'wl_general_settings', self::PUBLISHER_ID, null );
-	}
-
-	/**
-	 * Set the publisher entity post id.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @param int $value The publisher entity post id.
-	 */
-	public function set_publisher_id( $value ) {
-
-		$this->set( 'wl_general_settings', self::PUBLISHER_ID, $value );
-
-	}
-
-	/**
-	 * Get the dataset URI.
-	 *
-	 * @since 3.10.0
-	 *
-	 * @return string The dataset URI or an empty string if not set.
-	 */
-	public function get_dataset_uri() {
-
-		return $this->get( 'wl_advanced_settings', self::DATASET_URI, null );
-	}
-
-	/**
-	 * Set the dataset URI.
-	 *
-	 * @since 3.10.0
-	 *
-	 * @param string $value The dataset URI.
-	 */
-	public function set_dataset_uri( $value ) {
-
-		$this->set( 'wl_advanced_settings', self::DATASET_URI, $value );
-	}
-
-	/**
-	 * Intercept the change of the WordLift key in order to set the dataset URI.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param array $old_value The old settings.
-	 * @param array $new_value The new settings.
-	 */
-	public function update_key( $old_value, $new_value ) {
-
-		// Check the old key value and the new one. We're going to ask for the dataset URI only if the key has changed.
-		$old_key = isset( $old_value['key'] ) ? $old_value['key'] : '';
-		$new_key = isset( $new_value['key'] ) ? $new_value['key'] : '';
-
-		// If the key hasn't changed, don't do anything.
-		// WARN The 'update_option' hook is fired only if the new and old value are not equal.
-		if ( $old_key === $new_key ) {
-			return;
-		}
-
-		// If the key is empty, empty the dataset URI.
-		if ( '' === $new_key ) {
-			$this->set_dataset_uri( '' );
-		}
-
-		// make the request to the remote server.
-		$this->get_remote_dataset_uri( $new_key );
-	}
-
-	/**
-	 * Handle retrieving the dataset uri from the remote server.
-	 *
-	 * If a valid dataset uri is returned it is stored in the appropriate option,
-	 * otherwise the option is set to empty string.
-	 *
-	 * @since 3.17.0 send the site URL and get the dataset URI.
-	 * @since 3.12.0
-	 *
-	 * @param string $key The key to be used.
-	 */
-	public function get_remote_dataset_uri( $key ) {
-
-		$this->log->trace( 'Getting the remote dataset URI...' );
-
-		/**
-		 * Allow 3rd parties to change the site_url.
-		 *
-		 * @since 3.20.0
-		 *
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/850
-		 *
-		 * @param string $site_url The site url.
-		 */
-		$site_url = apply_filters( 'wl_production_site_url', site_url() );
-
-		// Build the URL.
-		$url = $this->get_accounts()
-		       . '?key=' . rawurlencode( $key )
-		       . '&url=' . rawurlencode( $site_url );
-
-		$args     = wp_parse_args( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
-			'method' => 'PUT',
-		) );
-		$response = wp_remote_request( $url, $args );
-
-		// The response is an error.
-		if ( is_wp_error( $response ) ) {
-			$this->log->error( 'An error occurred setting the dataset URI: ' . $response->get_error_message() );
-
-			$this->set_dataset_uri( '' );
-
-			return;
-		}
-
-		// The response is not OK.
-		if ( 200 !== (int) $response['response']['code'] ) {
-			$this->log->error( "Unexpected status code when opening URL $url: " . $response['response']['code'] );
-
-			$this->set_dataset_uri( '' );
-
-			return;
-		}
-
-		$json        = json_decode( $response['body'] );
-		$dataset_uri = $json->datasetURI;
-
-		$this->log->info( "Setting the dataset URI to $dataset_uri..." );
-
-		$this->set_dataset_uri( $dataset_uri );
-
-	}
-
-	/**
-	 * Handle the edge case where a user submits the same key again
-	 * when he does not have the dataset uri to regain it.
-	 *
-	 * This can not be handled in the normal option update hook because
-	 * it is not being triggered when the save value equals to the one already
-	 * in the DB.
-	 *
-	 * @since 3.12.0
-	 *
-	 * @param mixed $value The new, unserialized option value.
-	 * @param mixed $old_value The old option value.
-	 *
-	 * @return mixed The same value in the $value parameter
-	 */
-	function maybe_update_dataset_uri( $value, $old_value ) {
-
-		// Check the old key value and the new one. Here we're only handling the
-		// case where the key hasn't changed and the dataset URI isn't set. The
-		// other case, i.e. a new key is inserted, is handled at `update_key`.
-		$old_key = isset( $old_value['key'] ) ? $old_value['key'] : '';
-		$new_key = isset( $value['key'] ) ? $value['key'] : '';
-
-		$dataset_uri = $this->get_dataset_uri();
-
-		if ( ! empty( $new_key ) && $new_key === $old_key && empty( $dataset_uri ) ) {
-
-			// make the request to the remote server to try to get the dataset uri.
-			$this->get_remote_dataset_uri( $new_key );
-		}
-
-		return $value;
-	}
-
-	/**
-	 * Get the API URI to retrieve the dataset URI using the WordLift Key.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param string $key The WordLift key to use.
-	 *
-	 * @return string The API URI.
-	 */
-	public function get_accounts_by_key_dataset_uri( $key ) {
-
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "accounts/key=$key/dataset_uri";
-	}
-
-	/**
-	 * Get the `accounts` end point.
-	 *
-	 * @since 3.16.0
-	 *
-	 * @return string The `accounts` end point.
-	 */
-	public function get_accounts() {
-
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . 'accounts';
-	}
-
-	/**
-	 * Get the `link by default` option.
-	 *
-	 * @since 3.13.0
-	 *
-	 * @return bool True if entities must be linked by default otherwise false.
-	 */
-	public function is_link_by_default() {
-
-		return 'yes' === $this->get( 'wl_general_settings', self::LINK_BY_DEFAULT, 'yes' );
-	}
-
-	/**
-	 * Set the `link by default` option.
-	 *
-	 * @since 3.13.0
-	 *
-	 * @param bool $value True to enabling linking by default, otherwise false.
-	 */
-	public function set_link_by_default( $value ) {
-
-		$this->set( 'wl_general_settings', self::LINK_BY_DEFAULT, true === $value ? 'yes' : 'no' );
-	}
-
-	/**
-	 * Get the URL to perform batch analyses.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @return string The URL to call to perform the batch analyzes.
-	 */
-	public function get_batch_analysis_url() {
-
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . 'batch-analyses';
-
-	}
-
-	/**
-	 * Get the URL to perform autocomplete request.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @return string The URL to call to perform the batch analyzes.
-	 */
-	public function get_autocomplete_url() {
-
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . 'autocomplete';
-
-	}
-
-	/**
-	 * Get the URL to perform feedback deactivation request.
-	 *
-	 * @since 3.19.0
-	 *
-	 * @return string The URL to call to perform the feedback deactivation request.
-	 */
-	public function get_deactivation_feedback_url() {
-
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . 'feedbacks';
-
-	}
+    /**
+     * The entity base path option name.
+     *
+     * @since 3.6.0
+     */
+    const ENTITY_BASE_PATH_KEY = 'wl_entity_base_path';
+
+    /**
+     * The skip wizard (admin installation wizard) option name.
+     *
+     * @since 3.9.0
+     */
+    const SKIP_WIZARD = 'wl_skip_wizard';
+
+    /**
+     * WordLift's key option name.
+     *
+     * @since 3.9.0
+     */
+    const KEY = 'key';
+
+    /**
+     * WordLift's configured language option name.
+     *
+     * @since 3.9.0
+     */
+    const LANGUAGE = 'site_language';
+
+    /**
+     * The publisher entity post ID option name.
+     *
+     * @since 3.9.0
+     */
+    const PUBLISHER_ID = 'publisher_id';
+
+    /**
+     * The dataset URI option name
+     *
+     * @since 3.10.0
+     */
+    const DATASET_URI = 'redlink_dataset_uri';
+
+    /**
+     * The link by default option name.
+     *
+     * @since 3.11.0
+     */
+    const LINK_BY_DEFAULT = 'link_by_default';
+
+    /**
+     * The user preferences about sharing data option.
+     *
+     * @since 3.19.0
+     */
+    const SEND_DIAGNOSTIC = 'send_diagnostic';
+
+    /**
+     * The {@link Wordlift_Log_Service} instance.
+     *
+     * @since 3.16.0
+     *
+     * @var \Wordlift_Log_Service $log The {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * The Wordlift_Configuration_Service's singleton instance.
+     *
+     * @since  3.6.0
+     *
+     * @access private
+     * @var \Wordlift_Configuration_Service $instance Wordlift_Configuration_Service's singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * Create a Wordlift_Configuration_Service's instance.
+     *
+     * @since 3.6.0
+     */
+    public function __construct() {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance.
+     *
+     * @since 3.6.0
+     *
+     * @return \Wordlift_Configuration_Service
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Get a configuration given the option name and a key. The option value is
+     * expected to be an array.
+     *
+     * @since 3.6.0
+     *
+     * @param string $option The option name.
+     * @param string $key A key in the option value array.
+     * @param string $default The default value in case the key is not found (by default an empty string).
+     *
+     * @return mixed The configuration value or the default value if not found.
+     */
+    private function get( $option, $key, $default = '' ) {
+
+        $options = get_option( $option, array() );
+
+        return isset( $options[ $key ] ) ? $options[ $key ] : $default;
+    }
+
+    /**
+     * Set a configuration parameter.
+     *
+     * @since 3.9.0
+     *
+     * @param string $option Name of option to retrieve. Expected to not be SQL-escaped.
+     * @param string $key The value key.
+     * @param mixed  $value The value.
+     */
+    private function set( $option, $key, $value ) {
+
+        $values         = get_option( $option );
+        $values         = isset( $values ) ? $values : array();
+        $values[ $key ] = $value;
+        update_option( $option, $values );
+
+    }
+
+    /**
+     * Get the entity base path, by default 'entity'.
+     *
+     * @since 3.6.0
+     *
+     * @return string The entity base path.
+     */
+    public function get_entity_base_path() {
+
+        return $this->get( 'wl_general_settings', self::ENTITY_BASE_PATH_KEY, 'entity' );
+    }
+
+    /**
+     * Get the entity base path.
+     *
+     * @since 3.9.0
+     *
+     * @param string $value The entity base path.
+     */
+    public function set_entity_base_path( $value ) {
+
+        $this->set( 'wl_general_settings', self::ENTITY_BASE_PATH_KEY, $value );
+
+    }
+
+    /**
+     * Whether the installation skip wizard should be skipped.
+     *
+     * @since 3.9.0
+     *
+     * @return bool True if it should be skipped otherwise false.
+     */
+    public function is_skip_wizard() {
+
+        return $this->get( 'wl_general_settings', self::SKIP_WIZARD, false );
+    }
+
+    /**
+     * Set the skip wizard parameter.
+     *
+     * @since 3.9.0
+     *
+     * @param bool $value True to skip the wizard. We expect a boolean value.
+     */
+    public function set_skip_wizard( $value ) {
+
+        $this->set( 'wl_general_settings', self::SKIP_WIZARD, true === $value );
+
+    }
+
+    /**
+     * Get WordLift's key.
+     *
+     * @since 3.9.0
+     *
+     * @return string WordLift's key or an empty string if not set.
+     */
+    public function get_key() {
+
+        return $this->get( 'wl_general_settings', self::KEY, '' );
+    }
+
+    /**
+     * Set WordLift's key.
+     *
+     * @since 3.9.0
+     *
+     * @param string $value WordLift's key.
+     */
+    public function set_key( $value ) {
+
+        $this->set( 'wl_general_settings', self::KEY, $value );
+    }
+
+    /**
+     * Get WordLift's configured language, by default 'en'.
+     *
+     * Note that WordLift's language is used when writing strings to the Linked Data dataset, not for the analysis.
+     *
+     * @since 3.9.0
+     *
+     * @return string WordLift's configured language code ('en' by default).
+     */
+    public function get_language_code() {
+
+        return $this->get( 'wl_general_settings', self::LANGUAGE, 'en' );
+    }
+
+    /**
+     * Set WordLift's language code, used when storing strings to the Linked Data dataset.
+     *
+     * @since 3.9.0
+     *
+     * @param string $value WordLift's language code.
+     */
+    public function set_language_code( $value ) {
+
+        $this->set( 'wl_general_settings', self::LANGUAGE, $value );
+
+    }
+
+    /**
+     * Set the user preferences about sharing diagnostic with us.
+     *
+     * @since 3.19.0
+     *
+     * @param string $value The user preferences(yes/no).
+     */
+    public function set_diagnostic_preferences( $value ) {
+
+        $this->set( 'wl_general_settings', self::SEND_DIAGNOSTIC, $value );
+
+    }
+
+    /**
+     * Get the user preferences about sharing diagnostic.
+     *
+     * @since 3.19.0
+     */
+    public function get_diagnostic_preferences() {
+
+        return $this->get( 'wl_general_settings', self::SEND_DIAGNOSTIC, 'no' );
+
+    }
+
+    /**
+     * Get the publisher entity post id.
+     *
+     * The publisher entity post id points to an entity post which contains the data for the publisher used in schema.org
+     * Article markup.
+     *
+     * @since 3.9.0
+     *
+     * @return int|NULL The publisher entity post id or NULL if not set.
+     */
+    public function get_publisher_id() {
+
+        return $this->get( 'wl_general_settings', self::PUBLISHER_ID, null );
+    }
+
+    /**
+     * Set the publisher entity post id.
+     *
+     * @since 3.9.0
+     *
+     * @param int $value The publisher entity post id.
+     */
+    public function set_publisher_id( $value ) {
+
+        $this->set( 'wl_general_settings', self::PUBLISHER_ID, $value );
+
+    }
+
+    /**
+     * Get the dataset URI.
+     *
+     * @since 3.10.0
+     *
+     * @return string The dataset URI or an empty string if not set.
+     */
+    public function get_dataset_uri() {
+
+        return $this->get( 'wl_advanced_settings', self::DATASET_URI, null );
+    }
+
+    /**
+     * Set the dataset URI.
+     *
+     * @since 3.10.0
+     *
+     * @param string $value The dataset URI.
+     */
+    public function set_dataset_uri( $value ) {
+
+        $this->set( 'wl_advanced_settings', self::DATASET_URI, $value );
+    }
+
+    /**
+     * Intercept the change of the WordLift key in order to set the dataset URI.
+     *
+     * @since 3.11.0
+     *
+     * @param array $old_value The old settings.
+     * @param array $new_value The new settings.
+     */
+    public function update_key( $old_value, $new_value ) {
+
+        // Check the old key value and the new one. We're going to ask for the dataset URI only if the key has changed.
+        $old_key = isset( $old_value['key'] ) ? $old_value['key'] : '';
+        $new_key = isset( $new_value['key'] ) ? $new_value['key'] : '';
+
+        // If the key hasn't changed, don't do anything.
+        // WARN The 'update_option' hook is fired only if the new and old value are not equal.
+        if ( $old_key === $new_key ) {
+            return;
+        }
+
+        // If the key is empty, empty the dataset URI.
+        if ( '' === $new_key ) {
+            $this->set_dataset_uri( '' );
+        }
+
+        // make the request to the remote server.
+        $this->get_remote_dataset_uri( $new_key );
+    }
+
+    /**
+     * Handle retrieving the dataset uri from the remote server.
+     *
+     * If a valid dataset uri is returned it is stored in the appropriate option,
+     * otherwise the option is set to empty string.
+     *
+     * @since 3.17.0 send the site URL and get the dataset URI.
+     * @since 3.12.0
+     *
+     * @param string $key The key to be used.
+     */
+    public function get_remote_dataset_uri( $key ) {
+
+        $this->log->trace( 'Getting the remote dataset URI...' );
+
+        /**
+         * Allow 3rd parties to change the site_url.
+         *
+         * @since 3.20.0
+         *
+         * @see https://github.com/insideout10/wordlift-plugin/issues/850
+         *
+         * @param string $site_url The site url.
+         */
+        $site_url = apply_filters( 'wl_production_site_url', site_url() );
+
+        // Build the URL.
+        $url = $this->get_accounts()
+                . '?key=' . rawurlencode( $key )
+                . '&url=' . rawurlencode( $site_url );
+
+        $args     = wp_parse_args( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
+            'method' => 'PUT',
+        ) );
+        $response = wp_remote_request( $url, $args );
+
+        // The response is an error.
+        if ( is_wp_error( $response ) ) {
+            $this->log->error( 'An error occurred setting the dataset URI: ' . $response->get_error_message() );
+
+            $this->set_dataset_uri( '' );
+
+            return;
+        }
+
+        // The response is not OK.
+        if ( 200 !== (int) $response['response']['code'] ) {
+            $this->log->error( "Unexpected status code when opening URL $url: " . $response['response']['code'] );
+
+            $this->set_dataset_uri( '' );
+
+            return;
+        }
+
+        $json        = json_decode( $response['body'] );
+        $dataset_uri = $json->datasetURI;
+
+        $this->log->info( "Setting the dataset URI to $dataset_uri..." );
+
+        $this->set_dataset_uri( $dataset_uri );
+
+    }
+
+    /**
+     * Handle the edge case where a user submits the same key again
+     * when he does not have the dataset uri to regain it.
+     *
+     * This can not be handled in the normal option update hook because
+     * it is not being triggered when the save value equals to the one already
+     * in the DB.
+     *
+     * @since 3.12.0
+     *
+     * @param mixed $value The new, unserialized option value.
+     * @param mixed $old_value The old option value.
+     *
+     * @return mixed The same value in the $value parameter
+     */
+    function maybe_update_dataset_uri( $value, $old_value ) {
+
+        // Check the old key value and the new one. Here we're only handling the
+        // case where the key hasn't changed and the dataset URI isn't set. The
+        // other case, i.e. a new key is inserted, is handled at `update_key`.
+        $old_key = isset( $old_value['key'] ) ? $old_value['key'] : '';
+        $new_key = isset( $value['key'] ) ? $value['key'] : '';
+
+        $dataset_uri = $this->get_dataset_uri();
+
+        if ( ! empty( $new_key ) && $new_key === $old_key && empty( $dataset_uri ) ) {
+
+            // make the request to the remote server to try to get the dataset uri.
+            $this->get_remote_dataset_uri( $new_key );
+        }
+
+        return $value;
+    }
+
+    /**
+     * Get the API URI to retrieve the dataset URI using the WordLift Key.
+     *
+     * @since 3.11.0
+     *
+     * @param string $key The WordLift key to use.
+     *
+     * @return string The API URI.
+     */
+    public function get_accounts_by_key_dataset_uri( $key ) {
+
+        return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "accounts/key=$key/dataset_uri";
+    }
+
+    /**
+     * Get the `accounts` end point.
+     *
+     * @since 3.16.0
+     *
+     * @return string The `accounts` end point.
+     */
+    public function get_accounts() {
+
+        return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . 'accounts';
+    }
+
+    /**
+     * Get the `link by default` option.
+     *
+     * @since 3.13.0
+     *
+     * @return bool True if entities must be linked by default otherwise false.
+     */
+    public function is_link_by_default() {
+
+        return 'yes' === $this->get( 'wl_general_settings', self::LINK_BY_DEFAULT, 'yes' );
+    }
+
+    /**
+     * Set the `link by default` option.
+     *
+     * @since 3.13.0
+     *
+     * @param bool $value True to enabling linking by default, otherwise false.
+     */
+    public function set_link_by_default( $value ) {
+
+        $this->set( 'wl_general_settings', self::LINK_BY_DEFAULT, true === $value ? 'yes' : 'no' );
+    }
+
+    /**
+     * Get the URL to perform batch analyses.
+     *
+     * @since 3.14.0
+     *
+     * @return string The URL to call to perform the batch analyzes.
+     */
+    public function get_batch_analysis_url() {
+
+        return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . 'batch-analyses';
+
+    }
+
+    /**
+     * Get the URL to perform autocomplete request.
+     *
+     * @since 3.15.0
+     *
+     * @return string The URL to call to perform the batch analyzes.
+     */
+    public function get_autocomplete_url() {
+
+        return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . 'autocomplete';
+
+    }
+
+    /**
+     * Get the URL to perform feedback deactivation request.
+     *
+     * @since 3.19.0
+     *
+     * @return string The URL to call to perform the feedback deactivation request.
+     */
+    public function get_deactivation_feedback_url() {
+
+        return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . 'feedbacks';
+
+    }
 
 }

Spacing +69 added lines, -69 removed lines

@@ -10,7 +10,7 @@ 
  * @since      3.6.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -103,7 +103,7 @@ 
 	 */
 	public function __construct() {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		self::$instance = $this;
 
@@ -133,11 +133,11 @@ 
 	 *
 	 * @return mixed The configuration value or the default value if not found.
 	 */
-	private function get( $option, $key, $default = '' ) {
+	private function get($option, $key, $default = '') {
 
-		$options = get_option( $option, array() );
+		$options = get_option($option, array());
 
-		return isset( $options[ $key ] ) ? $options[ $key ] : $default;
+		return isset($options[$key]) ? $options[$key] : $default;
 	}
 
 	/**
@@ -149,12 +149,12 @@ 
 	 * @param string $key The value key.
 	 * @param mixed  $value The value.
 	 */
-	private function set( $option, $key, $value ) {
+	private function set($option, $key, $value) {
 
-		$values         = get_option( $option );
-		$values         = isset( $values ) ? $values : array();
-		$values[ $key ] = $value;
-		update_option( $option, $values );
+		$values         = get_option($option);
+		$values         = isset($values) ? $values : array();
+		$values[$key] = $value;
+		update_option($option, $values);
 
 	}
 
@@ -167,7 +167,7 @@ 
 	 */
 	public function get_entity_base_path() {
 
-		return $this->get( 'wl_general_settings', self::ENTITY_BASE_PATH_KEY, 'entity' );
+		return $this->get('wl_general_settings', self::ENTITY_BASE_PATH_KEY, 'entity');
 	}
 
 	/**
@@ -177,9 +177,9 @@ 
 	 *
 	 * @param string $value The entity base path.
 	 */
-	public function set_entity_base_path( $value ) {
+	public function set_entity_base_path($value) {
 
-		$this->set( 'wl_general_settings', self::ENTITY_BASE_PATH_KEY, $value );
+		$this->set('wl_general_settings', self::ENTITY_BASE_PATH_KEY, $value);
 
 	}
 
@@ -192,7 +192,7 @@ 
 	 */
 	public function is_skip_wizard() {
 
-		return $this->get( 'wl_general_settings', self::SKIP_WIZARD, false );
+		return $this->get('wl_general_settings', self::SKIP_WIZARD, false);
 	}
 
 	/**
@@ -202,9 +202,9 @@ 
 	 *
 	 * @param bool $value True to skip the wizard. We expect a boolean value.
 	 */
-	public function set_skip_wizard( $value ) {
+	public function set_skip_wizard($value) {
 
-		$this->set( 'wl_general_settings', self::SKIP_WIZARD, true === $value );
+		$this->set('wl_general_settings', self::SKIP_WIZARD, true === $value);
 
 	}
 
@@ -217,7 +217,7 @@ 
 	 */
 	public function get_key() {
 
-		return $this->get( 'wl_general_settings', self::KEY, '' );
+		return $this->get('wl_general_settings', self::KEY, '');
 	}
 
 	/**
@@ -227,9 +227,9 @@ 
 	 *
 	 * @param string $value WordLift's key.
 	 */
-	public function set_key( $value ) {
+	public function set_key($value) {
 
-		$this->set( 'wl_general_settings', self::KEY, $value );
+		$this->set('wl_general_settings', self::KEY, $value);
 	}
 
 	/**
@@ -243,7 +243,7 @@ 
 	 */
 	public function get_language_code() {
 
-		return $this->get( 'wl_general_settings', self::LANGUAGE, 'en' );
+		return $this->get('wl_general_settings', self::LANGUAGE, 'en');
 	}
 
 	/**
@@ -253,9 +253,9 @@ 
 	 *
 	 * @param string $value WordLift's language code.
 	 */
-	public function set_language_code( $value ) {
+	public function set_language_code($value) {
 
-		$this->set( 'wl_general_settings', self::LANGUAGE, $value );
+		$this->set('wl_general_settings', self::LANGUAGE, $value);
 
 	}
 
@@ -266,9 +266,9 @@ 
 	 *
 	 * @param string $value The user preferences(yes/no).
 	 */
-	public function set_diagnostic_preferences( $value ) {
+	public function set_diagnostic_preferences($value) {
 
-		$this->set( 'wl_general_settings', self::SEND_DIAGNOSTIC, $value );
+		$this->set('wl_general_settings', self::SEND_DIAGNOSTIC, $value);
 
 	}
 
@@ -279,7 +279,7 @@ 
 	 */
 	public function get_diagnostic_preferences() {
 
-		return $this->get( 'wl_general_settings', self::SEND_DIAGNOSTIC, 'no' );
+		return $this->get('wl_general_settings', self::SEND_DIAGNOSTIC, 'no');
 
 	}
 
@@ -295,7 +295,7 @@ 
 	 */
 	public function get_publisher_id() {
 
-		return $this->get( 'wl_general_settings', self::PUBLISHER_ID, null );
+		return $this->get('wl_general_settings', self::PUBLISHER_ID, null);
 	}
 
 	/**
@@ -305,9 +305,9 @@ 
 	 *
 	 * @param int $value The publisher entity post id.
 	 */
-	public function set_publisher_id( $value ) {
+	public function set_publisher_id($value) {
 
-		$this->set( 'wl_general_settings', self::PUBLISHER_ID, $value );
+		$this->set('wl_general_settings', self::PUBLISHER_ID, $value);
 
 	}
 
@@ -320,7 +320,7 @@ 
 	 */
 	public function get_dataset_uri() {
 
-		return $this->get( 'wl_advanced_settings', self::DATASET_URI, null );
+		return $this->get('wl_advanced_settings', self::DATASET_URI, null);
 	}
 
 	/**
@@ -330,9 +330,9 @@ 
 	 *
 	 * @param string $value The dataset URI.
 	 */
-	public function set_dataset_uri( $value ) {
+	public function set_dataset_uri($value) {
 
-		$this->set( 'wl_advanced_settings', self::DATASET_URI, $value );
+		$this->set('wl_advanced_settings', self::DATASET_URI, $value);
 	}
 
 	/**
@@ -343,25 +343,25 @@ 
 	 * @param array $old_value The old settings.
 	 * @param array $new_value The new settings.
 	 */
-	public function update_key( $old_value, $new_value ) {
+	public function update_key($old_value, $new_value) {
 
 		// Check the old key value and the new one. We're going to ask for the dataset URI only if the key has changed.
-		$old_key = isset( $old_value['key'] ) ? $old_value['key'] : '';
-		$new_key = isset( $new_value['key'] ) ? $new_value['key'] : '';
+		$old_key = isset($old_value['key']) ? $old_value['key'] : '';
+		$new_key = isset($new_value['key']) ? $new_value['key'] : '';
 
 		// If the key hasn't changed, don't do anything.
 		// WARN The 'update_option' hook is fired only if the new and old value are not equal.
-		if ( $old_key === $new_key ) {
+		if ($old_key === $new_key) {
 			return;
 		}
 
 		// If the key is empty, empty the dataset URI.
-		if ( '' === $new_key ) {
-			$this->set_dataset_uri( '' );
+		if ('' === $new_key) {
+			$this->set_dataset_uri('');
 		}
 
 		// make the request to the remote server.
-		$this->get_remote_dataset_uri( $new_key );
+		$this->get_remote_dataset_uri($new_key);
 	}
 
 	/**
@@ -375,9 +375,9 @@ 
 	 *
 	 * @param string $key The key to be used.
 	 */
-	public function get_remote_dataset_uri( $key ) {
+	public function get_remote_dataset_uri($key) {
 
-		$this->log->trace( 'Getting the remote dataset URI...' );
+		$this->log->trace('Getting the remote dataset URI...');
 
 		/**
 		 * Allow 3rd parties to change the site_url.
@@ -388,42 +388,42 @@ 
 		 *
 		 * @param string $site_url The site url.
 		 */
-		$site_url = apply_filters( 'wl_production_site_url', site_url() );
+		$site_url = apply_filters('wl_production_site_url', site_url());
 
 		// Build the URL.
 		$url = $this->get_accounts()
-		       . '?key=' . rawurlencode( $key )
-		       . '&url=' . rawurlencode( $site_url );
+		       . '?key='.rawurlencode($key)
+		       . '&url='.rawurlencode($site_url);
 
-		$args     = wp_parse_args( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
+		$args     = wp_parse_args(unserialize(WL_REDLINK_API_HTTP_OPTIONS), array(
 			'method' => 'PUT',
-		) );
-		$response = wp_remote_request( $url, $args );
+		));
+		$response = wp_remote_request($url, $args);
 
 		// The response is an error.
-		if ( is_wp_error( $response ) ) {
-			$this->log->error( 'An error occurred setting the dataset URI: ' . $response->get_error_message() );
+		if (is_wp_error($response)) {
+			$this->log->error('An error occurred setting the dataset URI: '.$response->get_error_message());
 
-			$this->set_dataset_uri( '' );
+			$this->set_dataset_uri('');
 
 			return;
 		}
 
 		// The response is not OK.
-		if ( 200 !== (int) $response['response']['code'] ) {
-			$this->log->error( "Unexpected status code when opening URL $url: " . $response['response']['code'] );
+		if (200 !== (int) $response['response']['code']) {
+			$this->log->error("Unexpected status code when opening URL $url: ".$response['response']['code']);
 
-			$this->set_dataset_uri( '' );
+			$this->set_dataset_uri('');
 
 			return;
 		}
 
-		$json        = json_decode( $response['body'] );
+		$json        = json_decode($response['body']);
 		$dataset_uri = $json->datasetURI;
 
-		$this->log->info( "Setting the dataset URI to $dataset_uri..." );
+		$this->log->info("Setting the dataset URI to $dataset_uri...");
 
-		$this->set_dataset_uri( $dataset_uri );
+		$this->set_dataset_uri($dataset_uri);
 
 	}
 
@@ -442,20 +442,20 @@ 
 	 *
 	 * @return mixed The same value in the $value parameter
 	 */
-	function maybe_update_dataset_uri( $value, $old_value ) {
+	function maybe_update_dataset_uri($value, $old_value) {
 
 		// Check the old key value and the new one. Here we're only handling the
 		// case where the key hasn't changed and the dataset URI isn't set. The
 		// other case, i.e. a new key is inserted, is handled at `update_key`.
-		$old_key = isset( $old_value['key'] ) ? $old_value['key'] : '';
-		$new_key = isset( $value['key'] ) ? $value['key'] : '';
+		$old_key = isset($old_value['key']) ? $old_value['key'] : '';
+		$new_key = isset($value['key']) ? $value['key'] : '';
 
 		$dataset_uri = $this->get_dataset_uri();
 
-		if ( ! empty( $new_key ) && $new_key === $old_key && empty( $dataset_uri ) ) {
+		if ( ! empty($new_key) && $new_key === $old_key && empty($dataset_uri)) {
 
 			// make the request to the remote server to try to get the dataset uri.
-			$this->get_remote_dataset_uri( $new_key );
+			$this->get_remote_dataset_uri($new_key);
 		}
 
 		return $value;
@@ -470,9 +470,9 @@ 
 	 *
 	 * @return string The API URI.
 	 */
-	public function get_accounts_by_key_dataset_uri( $key ) {
+	public function get_accounts_by_key_dataset_uri($key) {
 
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "accounts/key=$key/dataset_uri";
+		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE."accounts/key=$key/dataset_uri";
 	}
 
 	/**
@@ -484,7 +484,7 @@ 
 	 */
 	public function get_accounts() {
 
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . 'accounts';
+		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE.'accounts';
 	}
 
 	/**
@@ -496,7 +496,7 @@ 
 	 */
 	public function is_link_by_default() {
 
-		return 'yes' === $this->get( 'wl_general_settings', self::LINK_BY_DEFAULT, 'yes' );
+		return 'yes' === $this->get('wl_general_settings', self::LINK_BY_DEFAULT, 'yes');
 	}
 
 	/**
@@ -506,9 +506,9 @@ 
 	 *
 	 * @param bool $value True to enabling linking by default, otherwise false.
 	 */
-	public function set_link_by_default( $value ) {
+	public function set_link_by_default($value) {
 
-		$this->set( 'wl_general_settings', self::LINK_BY_DEFAULT, true === $value ? 'yes' : 'no' );
+		$this->set('wl_general_settings', self::LINK_BY_DEFAULT, true === $value ? 'yes' : 'no');
 	}
 
 	/**
@@ -520,7 +520,7 @@ 
 	 */
 	public function get_batch_analysis_url() {
 
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . 'batch-analyses';
+		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE.'batch-analyses';
 
 	}
 
@@ -533,7 +533,7 @@ 
 	 */
 	public function get_autocomplete_url() {
 
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . 'autocomplete';
+		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE.'autocomplete';
 
 	}
 
@@ -546,7 +546,7 @@ 
 	 */
 	public function get_deactivation_feedback_url() {
 
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . 'feedbacks';
+		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE.'feedbacks';
 
 	}
 

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

Indentation +55 added lines, -55 removed lines

@@ -16,68 +16,68 @@
  */
 class Wordlift_Post_Adapter {
 
-	/**
-	 * The post id to which the adopter relates.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @var integer $post_id .
-	 */
-	private $post_id;
+    /**
+     * The post id to which the adopter relates.
+     *
+     * @since 3.14.0
+     *
+     * @var integer $post_id .
+     */
+    private $post_id;
 
-	/**
-	 * Create the {@link Wordlift_Post_Adatpter} instance.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param integer $post_id the post ID of the post the adopter relates to.
-	 */
-	public function __construct( $post_id ) {
+    /**
+     * Create the {@link Wordlift_Post_Adatpter} instance.
+     *
+     * @since 3.14.0
+     *
+     * @param integer $post_id the post ID of the post the adopter relates to.
+     */
+    public function __construct( $post_id ) {
 
-		$this->post_id = $post_id;
+        $this->post_id = $post_id;
 
-	}
+    }
 
-	/**
-	 * Get the word count of the post content.
-	 *
-	 * The count is calculated over the post content after stripping shortcodes and html tags.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @return integer the number of words in the content after stripping shortcodes and html tags..
-	 */
-	public function word_count() {
+    /**
+     * Get the word count of the post content.
+     *
+     * The count is calculated over the post content after stripping shortcodes and html tags.
+     *
+     * @since 3.14.0
+     *
+     * @return integer the number of words in the content after stripping shortcodes and html tags..
+     */
+    public function word_count() {
 
-		$post = get_post( $this->post_id );
+        $post = get_post( $this->post_id );
 
-		return str_word_count( strip_tags( strip_shortcodes( $post->post_content ) ) );
-	}
+        return str_word_count( strip_tags( strip_shortcodes( $post->post_content ) ) );
+    }
 
-	/**
-	 * Get the {@link WP_Post} permalink allowing 3rd parties to alter the URL.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param int $post_id Post ID.
-	 *
-	 * @return string The post permalink.
-	 */
-	public static function get_production_permalink( $post_id ) {
+    /**
+     * Get the {@link WP_Post} permalink allowing 3rd parties to alter the URL.
+     *
+     * @since 3.20.0
+     *
+     * @param int $post_id Post ID.
+     *
+     * @return string The post permalink.
+     */
+    public static function get_production_permalink( $post_id ) {
 
-		/**
-		 * The `wl_production_permalink` filter allows to change the permalink, this is useful in contexts
-		 * when the production environment is copied over from a staging environment with staging
-		 * URLs.
-		 *
-		 * @since 3.20.0
-		 *
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/850
-		 *
-		 * @param string $permalink_url The default permalink.
-		 * @param int    $post_id The post id.
-		 */
-		return apply_filters( 'wl_production_permalink', get_permalink( $post_id ), $post_id );
-	}
+        /**
+         * The `wl_production_permalink` filter allows to change the permalink, this is useful in contexts
+         * when the production environment is copied over from a staging environment with staging
+         * URLs.
+         *
+         * @since 3.20.0
+         *
+         * @see https://github.com/insideout10/wordlift-plugin/issues/850
+         *
+         * @param string $permalink_url The default permalink.
+         * @param int    $post_id The post id.
+         */
+        return apply_filters( 'wl_production_permalink', get_permalink( $post_id ), $post_id );
+    }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -32,7 +32,7 @@ 
 	 *
 	 * @param integer $post_id the post ID of the post the adopter relates to.
 	 */
-	public function __construct( $post_id ) {
+	public function __construct($post_id) {
 
 		$this->post_id = $post_id;
 
@@ -49,9 +49,9 @@ 
 	 */
 	public function word_count() {
 
-		$post = get_post( $this->post_id );
+		$post = get_post($this->post_id);
 
-		return str_word_count( strip_tags( strip_shortcodes( $post->post_content ) ) );
+		return str_word_count(strip_tags(strip_shortcodes($post->post_content)));
 	}
 
 	/**
@@ -63,7 +63,7 @@ 
 	 *
 	 * @return string The post permalink.
 	 */
-	public static function get_production_permalink( $post_id ) {
+	public static function get_production_permalink($post_id) {
 
 		/**
 		 * The `wl_production_permalink` filter allows to change the permalink, this is useful in contexts
@@ -77,7 +77,7 @@ 
 		 * @param string $permalink_url The default permalink.
 		 * @param int    $post_id The post id.
 		 */
-		return apply_filters( 'wl_production_permalink', get_permalink( $post_id ), $post_id );
+		return apply_filters('wl_production_permalink', get_permalink($post_id), $post_id);
 	}
 
 }

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

Indentation +100 added lines, -100 removed lines

@@ -13,106 +13,106 @@
  */
 class Wordlift_Schema_Location_Property_Service extends Wordlift_Property_Service {
 
-	/**
-	 * The meta key used to store data for this property. We don't use wl_url to
-	 * avoid potential confusion about other URLs.
-	 *
-	 * @since 3.7.0
-	 */
-	const META_KEY = 'wl_location';
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_rdf_predicate() {
-
-		return 'http://schema.org/location';
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_rdf_data_type() {
-
-		return 'xsd:anyURI';
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_data_type() {
-
-		return Wordlift_Schema_Service::DATA_TYPE_URI;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_cardinality() {
-
-		return INF;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_metabox_class() {
-
-		return 'WL_Metabox_Field';
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_metabox_label() {
-
-		return 'Location(s)';
-	}
-
-	/**
-	 * @var
-	 */
-	private $sparql_service;
-
-	/**
-	 * Create a Wordlift_Schema_Location_Property_Service instance.
-	 * @since 3.7.0
-	 *
-	 * @param Wordlift_Sparql_Service $sparql_service
-	 */
-	public function __construct( $sparql_service ) {
-		parent::__construct();
-
-		$this->sparql_service = $sparql_service;
-	}
-
-	/**
-	 * Get the schema:url value for the specified post/entity.
-	 *
-	 * @since 3.7.0
-	 *
-	 * @param int $post_id The post id.
-	 *
-	 * @return array|NULL The schema:url value or NULL if not set.
-	 */
-	public function get( $post_id ) {
-
-		// Get the schema:url values set in WP.
-		$values = get_post_meta( $post_id, self::META_KEY, FALSE );
-
-		// Finally return whatever values the editor set.
-		return $values;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function sanitize( $value ) {
-
-		// TODO: check that it's an URL or that is <permalink>
-
-		return $value;
-	}
+    /**
+     * The meta key used to store data for this property. We don't use wl_url to
+     * avoid potential confusion about other URLs.
+     *
+     * @since 3.7.0
+     */
+    const META_KEY = 'wl_location';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_rdf_predicate() {
+
+        return 'http://schema.org/location';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_rdf_data_type() {
+
+        return 'xsd:anyURI';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_data_type() {
+
+        return Wordlift_Schema_Service::DATA_TYPE_URI;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_cardinality() {
+
+        return INF;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_metabox_class() {
+
+        return 'WL_Metabox_Field';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_metabox_label() {
+
+        return 'Location(s)';
+    }
+
+    /**
+     * @var
+     */
+    private $sparql_service;
+
+    /**
+     * Create a Wordlift_Schema_Location_Property_Service instance.
+     * @since 3.7.0
+     *
+     * @param Wordlift_Sparql_Service $sparql_service
+     */
+    public function __construct( $sparql_service ) {
+        parent::__construct();
+
+        $this->sparql_service = $sparql_service;
+    }
+
+    /**
+     * Get the schema:url value for the specified post/entity.
+     *
+     * @since 3.7.0
+     *
+     * @param int $post_id The post id.
+     *
+     * @return array|NULL The schema:url value or NULL if not set.
+     */
+    public function get( $post_id ) {
+
+        // Get the schema:url values set in WP.
+        $values = get_post_meta( $post_id, self::META_KEY, FALSE );
+
+        // Finally return whatever values the editor set.
+        return $values;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function sanitize( $value ) {
+
+        // TODO: check that it's an URL or that is <permalink>
+
+        return $value;
+    }
 
 //	/**
 //	 * Generate an insert query that inserts the schema:url values for the specified

Spacing +4 added lines, -4 removed lines

@@ -80,7 +80,7 @@ 
 	 *
 	 * @param Wordlift_Sparql_Service $sparql_service
 	 */
-	public function __construct( $sparql_service ) {
+	public function __construct($sparql_service) {
 		parent::__construct();
 
 		$this->sparql_service = $sparql_service;
@@ -95,10 +95,10 @@ 
 	 *
 	 * @return array|NULL The schema:url value or NULL if not set.
 	 */
-	public function get( $post_id ) {
+	public function get($post_id) {
 
 		// Get the schema:url values set in WP.
-		$values = get_post_meta( $post_id, self::META_KEY, FALSE );
+		$values = get_post_meta($post_id, self::META_KEY, FALSE);
 
 		// Finally return whatever values the editor set.
 		return $values;
@@ -107,7 +107,7 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function sanitize( $value ) {
+	public function sanitize($value) {
 
 		// TODO: check that it's an URL or that is <permalink>
 

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

Indentation +18 added lines, -18 removed lines

@@ -14,32 +14,32 @@
  */
 class Wordlift_Url_Property_Service extends Wordlift_Simple_Property_Service {
 
-	const META_KEY = 'wl_schema_url';
+    const META_KEY = 'wl_schema_url';
 
-	public function get( $post_id, $meta_key ) {
+    public function get( $post_id, $meta_key ) {
 
-		// Get the meta values and push the <permalink> to
-		// ensure that default url will be added to the schema:url's.
-		$urls = array_unique( // We need to avoid duplicates.
-			array_merge(
-				parent::get( $post_id, $meta_key ), // Get default meta values
-				array(
-					'<permalink>', // Add the permalink in case it was removed.
-				)
-			)
-		);
+        // Get the meta values and push the <permalink> to
+        // ensure that default url will be added to the schema:url's.
+        $urls = array_unique( // We need to avoid duplicates.
+            array_merge(
+                parent::get( $post_id, $meta_key ), // Get default meta values
+                array(
+                    '<permalink>', // Add the permalink in case it was removed.
+                )
+            )
+        );
 
-		// Convert <permalink> in actual permalink values.
-		return array_map( function ( $item ) use ( $post_id ) {
-			/*
+        // Convert <permalink> in actual permalink values.
+        return array_map( function ( $item ) use ( $post_id ) {
+            /*
 			 * If `<permalink>` get the production permalink.
 			 *
 			 * @since 3.20.0
 			 *
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/850.
 			 */
-			return '<permalink>' === $item ? Wordlift_Post_Adapter::get_production_permalink( $post_id ) : $item;
-		}, $urls );
-	}
+            return '<permalink>' === $item ? Wordlift_Post_Adapter::get_production_permalink( $post_id ) : $item;
+        }, $urls );
+    }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -16,13 +16,13 @@ 
 
 	const META_KEY = 'wl_schema_url';
 
-	public function get( $post_id, $meta_key ) {
+	public function get($post_id, $meta_key) {
 
 		// Get the meta values and push the <permalink> to
 		// ensure that default url will be added to the schema:url's.
 		$urls = array_unique( // We need to avoid duplicates.
 			array_merge(
-				parent::get( $post_id, $meta_key ), // Get default meta values
+				parent::get($post_id, $meta_key), // Get default meta values
 				array(
 					'<permalink>', // Add the permalink in case it was removed.
 				)
@@ -30,7 +30,7 @@ 
 		);
 
 		// Convert <permalink> in actual permalink values.
-		return array_map( function ( $item ) use ( $post_id ) {
+		return array_map(function($item) use ($post_id) {
 			/*
 			 * If `<permalink>` get the production permalink.
 			 *
@@ -38,8 +38,8 @@ 
 			 *
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/850.
 			 */
-			return '<permalink>' === $item ? Wordlift_Post_Adapter::get_production_permalink( $post_id ) : $item;
-		}, $urls );
+			return '<permalink>' === $item ? Wordlift_Post_Adapter::get_production_permalink($post_id) : $item;
+		}, $urls);
 	}
 
 }

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

Indentation +463 added lines, -463 removed lines

@@ -10,212 +10,212 @@ 
  */
 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 );
-	}
+    /**
+     * 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 );
+    }
 
 //	/**
 //	 * Get the delete query.
@@ -287,270 +287,270 @@ 
 //		return $query;
 //	}
 
-	/**
-	 * 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 ) {
-		/*
+    /**
+     * 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

@@ -75,16 +75,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);
 	}
 
 	/**
@@ -107,20 +107,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;
 	}
@@ -137,11 +137,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);
 	}
 
 	/**
@@ -153,9 +153,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);
 	}
 
 	/**
@@ -167,11 +167,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;
 		}
 
@@ -187,19 +187,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";
 	}
 
 	/**
@@ -212,9 +212,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);
 	}
 
 //	/**
@@ -295,15 +295,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');
 
 	}
 
@@ -315,15 +315,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);
 
 	}
 
@@ -336,9 +336,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);
 	}
 
 	/**
@@ -351,13 +351,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);
 	}
 
 	/**
@@ -369,15 +369,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);
 	}
 
 	/**
@@ -395,7 +395,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)
@@ -406,26 +406,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;
 			}
 		}
 
@@ -447,36 +447,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);
 	}
 
 	/**
@@ -495,28 +495,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);
 
 	}
 
@@ -528,11 +528,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;
 		}
@@ -541,15 +541,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/includes/class-wordlift-schema-url-property-service.php

Indentation +160 added lines, -160 removed lines

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

Spacing +17 added lines, -17 removed lines

@@ -66,7 +66,7 @@ 
 	 */
 	public function get_metabox_label() {
 
-		return __( 'Web Site(s)', 'wordlift' );
+		return __('Web Site(s)', 'wordlift');
 	}
 
 	/**
@@ -80,7 +80,7 @@ 
 	 *
 	 * @param Wordlift_Sparql_Service $sparql_service
 	 */
-	public function __construct( $sparql_service ) {
+	public function __construct($sparql_service) {
 		parent::__construct();
 
 		// Finally listen for metadata requests for this field.
@@ -98,20 +98,20 @@ 
 	 *
 	 * @return array|NULL The schema:url value or NULL if not set.
 	 */
-	public function get( $post_id ) {
+	public function get($post_id) {
 
 		// Get the schema:url values set in WP.
-		$values = get_post_meta( $post_id, self::META_KEY, false );
+		$values = get_post_meta($post_id, self::META_KEY, false);
 
 		// If the property has never been set, we set its default value the first
 		// time to <permalink>.
-		if ( empty( $values ) ) {
-			return array( '<permalink>' );
+		if (empty($values)) {
+			return array('<permalink>');
 		}
 
 		// If there's only one value and that value is empty, we return NULL, i.e.
 		// variable not set.
-		if ( 1 === count( $values ) && empty( $values[0] ) ) {
+		if (1 === count($values) && empty($values[0])) {
 			return null;
 		}
 
@@ -122,7 +122,7 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function sanitize( $value ) {
+	public function sanitize($value) {
 
 		// TODO: check that it's an URL or that is <permalink>
 
@@ -173,26 +173,26 @@ 
 	 *
 	 * @return array|mixed|NULL|string
 	 */
-	public function get_post_metadata( $value, $object_id, $meta_key, $single ) {
+	public function get_post_metadata($value, $object_id, $meta_key, $single) {
 
 		// It's not us, return the value.
-		if ( self::META_KEY !== $meta_key ) {
+		if (self::META_KEY !== $meta_key) {
 			return $value;
 		}
 
 		$this->remove_filter_get_post_metadata();
 
-		$new_value = $this->get( $object_id );
+		$new_value = $this->get($object_id);
 
 		$this->add_filter_get_post_metadata();
 
 		// If we must return a single value, but we don't have a value, then return an empty string.
-		if ( $single && ( is_null( $new_value ) || empty( $new_value ) ) ) {
+		if ($single && (is_null($new_value) || empty($new_value))) {
 			return '';
 		}
 
 		// If we have a value and we need to return it as single, return the first value.
-		if ( $single ) {
+		if ($single) {
 			return $new_value[0];
 		}
 
@@ -202,19 +202,19 @@ 
 
 	private function add_filter_get_post_metadata() {
 
-		add_filter( 'get_post_metadata', array(
+		add_filter('get_post_metadata', array(
 			$this,
 			'get_post_metadata',
-		), 10, 4 );
+		), 10, 4);
 
 	}
 
 	private function remove_filter_get_post_metadata() {
 
-		remove_filter( 'get_post_metadata', array(
+		remove_filter('get_post_metadata', array(
 			$this,
 			'get_post_metadata',
-		), 10 );
+		), 10);
 
 	}