insideout10 / wordlift-plugin

src/includes/wp-async-task/class-wordlift-async-task.php

Indentation +282 added lines, -282 removed lines

@@ -9,288 +9,288 @@
 
 abstract class Wordlift_Async_Task {
 
-	/**
-	 * Constant identifier for a task that should be available to logged-in users
-	 *
-	 * See constructor documentation for more details.
-	 */
-	const LOGGED_IN = 1;
-
-	/**
-	 * Constant identifier for a task that should be available to logged-out users
-	 *
-	 * See constructor documentation for more details.
-	 */
-	const LOGGED_OUT = 2;
-
-	/**
-	 * Constant identifier for a task that should be available to all users regardless of auth status
-	 *
-	 * See constructor documentation for more details.
-	 */
-	const BOTH = 3;
-
-	/**
-	 * This is the argument count for the main action set in the constructor. It
-	 * is set to an arbitrarily high value of twenty, but can be overridden if
-	 * necessary
-	 *
-	 * @var int
-	 */
-	protected $argument_count = 20;
-
-	/**
-	 * Priority to fire intermediate action.
-	 *
-	 * @var int
-	 */
-	protected $priority = 10;
-
-	/**
-	 * @var string
-	 */
-	protected $action;
-
-	/**
-	 * @var array
-	 */
-	protected $_body_data;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * Constructor to wire up the necessary actions
-	 *
-	 * Which hooks the asynchronous postback happens on can be set by the
-	 * $auth_level parameter. There are essentially three options: logged in users
-	 * only, logged out users only, or both. Set this when you instantiate an
-	 * object by using one of the three class constants to do so:
-	 *  - LOGGED_IN
-	 *  - LOGGED_OUT
-	 *  - BOTH
-	 * $auth_level defaults to BOTH
-	 *
-	 * @throws Exception If the class' $action value hasn't been set
-	 *
-	 * @param int $auth_level The authentication level to use (see above)
-	 */
-	public function __construct( $auth_level = self::BOTH ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		if ( empty( $this->action ) ) {
-			throw new Exception( 'Action not defined for class ' . __CLASS__ );
-		}
-		add_action( $this->action, array(
-			$this,
-			'launch',
-		), (int) $this->priority, (int) $this->argument_count );
-		if ( $auth_level & self::LOGGED_IN ) {
-			add_action( "admin_post_wl_async_$this->action", array(
-				$this,
-				'handle_postback',
-			) );
-		}
-		if ( $auth_level & self::LOGGED_OUT ) {
-			add_action( "admin_post_nopriv_wl_async_$this->action", array(
-				$this,
-				'handle_postback',
-			) );
-		}
-	}
-
-	/**
-	 * Add the shutdown action for launching the real postback if we don't
-	 * get an exception thrown by prepare_data().
-	 *
-	 * @uses func_get_args() To grab any arguments passed by the action
-	 */
-	public function launch() {
-		$data = func_get_args();
-		try {
-			$data = $this->prepare_data( $data );
-		} catch ( Exception $e ) {
-			return;
-		}
-
-		$data['action'] = "wl_async_$this->action";
-		$data['_nonce'] = $this->create_async_nonce();
-
-		$this->_body_data = $data;
-
-		if ( ! has_action( 'shutdown', array(
-			$this,
-			'launch_on_shutdown',
-		) )
-		) {
-			add_action( 'shutdown', array( $this, 'launch_on_shutdown' ) );
-		}
-	}
-
-	/**
-	 * Launch the request on the WordPress shutdown hook
-	 *
-	 * On VIP we got into data races due to the postback sometimes completing
-	 * faster than the data could propogate to the database server cluster.
-	 * This made WordPress get empty data sets from the database without
-	 * failing. On their advice, we're moving the actual firing of the async
-	 * postback to the shutdown hook. Supposedly that will ensure that the
-	 * data at least has time to get into the object cache.
-	 *
-	 * @uses $_COOKIE        To send a cookie header for async postback
-	 * @uses apply_filters()
-	 * @uses admin_url()
-	 * @uses wp_remote_post()
-	 */
-	public function launch_on_shutdown() {
-
-		$this->log->debug( "Launching Async Task [ action :: $this->action ]..." );
-
-		if ( ! empty( $this->_body_data ) ) {
-			$cookies = array();
-			foreach ( $_COOKIE as $name => $value ) {
-				$cookies[] = "$name=" . urlencode( is_array( $value ) ? serialize( $value ) : $value );
-			}
-
-			$request_args = array(
-				'timeout'   => 0.01,
-				'blocking'  => false,
-				'sslverify' => apply_filters( 'https_local_ssl_verify', false ),
-				'body'      => $this->_body_data,
-				'headers'   => array(
-					'cookie' => implode( '; ', $cookies ),
-				),
-			);
-
-			$url = get_site_url( null, 'wl-api' );
-
-			$this->log->debug( "Posting URL $url..." );
-
-			$result = wp_remote_post( $url, $request_args );
-
-			if ( is_wp_error( $result ) ) {
-				$this->log->error( 'Posting URL returned an error: ' . $result->get_error_message() );
-			}
-
-		}
-	}
-
-	/**
-	 * Verify the postback is valid, then fire any scheduled events.
-	 *
-	 * @uses $_POST['_nonce']
-	 * @uses is_user_logged_in()
-	 * @uses add_filter()
-	 * @uses wp_die()
-	 */
-	public function handle_postback() {
-		if ( isset( $_POST['_nonce'] ) && $this->verify_async_nonce( (string) $_POST['_nonce'] ) ) {
-			if ( ! is_user_logged_in() ) {
-				$this->action = "nopriv_$this->action";
-			}
-			$this->run_action();
-		}
-	}
-
-	/**
-	 * Create a random, one time use token.
-	 *
-	 * Based entirely on wp_create_nonce() but does not tie the nonce to the
-	 * current logged-in user.
-	 *
-	 * @uses wp_nonce_tick()
-	 * @uses wp_hash()
-	 *
-	 * @return string The one-time use token
-	 */
-	protected function create_async_nonce() {
-		$action = $this->get_nonce_action();
-		$i      = wp_nonce_tick();
-
-		return substr( wp_hash( $i . $action . get_class( $this ), 'nonce' ), - 12, 10 );
-	}
-
-	/**
-	 * Verify that the correct nonce was used within the time limit.
-	 *
-	 * @uses wp_nonce_tick()
-	 * @uses wp_hash()
-	 *
-	 * @param string $nonce Nonce to be verified
-	 *
-	 * @return bool Whether the nonce check passed or failed
-	 */
-	protected function verify_async_nonce( $nonce ) {
-		$action = $this->get_nonce_action();
-		$i      = wp_nonce_tick();
-
-		// Nonce generated 0-12 hours ago
-		if ( substr( wp_hash( $i . $action . get_class( $this ), 'nonce' ), - 12, 10 ) == $nonce ) {
-			return 1;
-		}
-
-		// Nonce generated 12-24 hours ago
-		if ( substr( wp_hash( ( $i - 1 ) . $action . get_class( $this ), 'nonce' ), - 12, 10 ) == $nonce ) {
-			return 2;
-		}
-
-		// Invalid nonce
-		return false;
-	}
-
-	/**
-	 * Get a nonce action based on the $action property of the class
-	 *
-	 * @return string The nonce action for the current instance
-	 */
-	protected function get_nonce_action() {
-		$action = $this->action;
-		if ( substr( $action, 0, 7 ) === 'nopriv_' ) {
-			$action = substr( $action, 7 );
-		}
-		$action = "wl_async_$action";
-
-		return $action;
-	}
-
-	/**
-	 * Prepare any data to be passed to the asynchronous postback
-	 *
-	 * The array this function receives will be a numerically keyed array from
-	 * func_get_args(). It is expected that you will return an associative array
-	 * so that the $_POST values used in the asynchronous call will make sense.
-	 *
-	 * The array you send back may or may not have anything to do with the data
-	 * passed into this method. It all depends on the implementation details and
-	 * what data is needed in the asynchronous postback.
-	 *
-	 * Do not set values for 'action' or '_nonce', as those will get overwritten
-	 * later in launch().
-	 *
-	 * @throws Exception If the postback should not occur for any reason
-	 *
-	 * @param array $data The raw data received by the launch method
-	 *
-	 * @return array The prepared data
-	 */
-	abstract protected function prepare_data( $data );
-
-	/**
-	 * Run the do_action function for the asynchronous postback.
-	 *
-	 * This method needs to fetch and sanitize any and all data from the $_POST
-	 * superglobal and provide them to the do_action call.
-	 *
-	 * The action should be constructed as "wl_async_task_$this->action"
-	 */
-	abstract protected function run_action();
+    /**
+     * Constant identifier for a task that should be available to logged-in users
+     *
+     * See constructor documentation for more details.
+     */
+    const LOGGED_IN = 1;
+
+    /**
+     * Constant identifier for a task that should be available to logged-out users
+     *
+     * See constructor documentation for more details.
+     */
+    const LOGGED_OUT = 2;
+
+    /**
+     * Constant identifier for a task that should be available to all users regardless of auth status
+     *
+     * See constructor documentation for more details.
+     */
+    const BOTH = 3;
+
+    /**
+     * This is the argument count for the main action set in the constructor. It
+     * is set to an arbitrarily high value of twenty, but can be overridden if
+     * necessary
+     *
+     * @var int
+     */
+    protected $argument_count = 20;
+
+    /**
+     * Priority to fire intermediate action.
+     *
+     * @var int
+     */
+    protected $priority = 10;
+
+    /**
+     * @var string
+     */
+    protected $action;
+
+    /**
+     * @var array
+     */
+    protected $_body_data;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * Constructor to wire up the necessary actions
+     *
+     * Which hooks the asynchronous postback happens on can be set by the
+     * $auth_level parameter. There are essentially three options: logged in users
+     * only, logged out users only, or both. Set this when you instantiate an
+     * object by using one of the three class constants to do so:
+     *  - LOGGED_IN
+     *  - LOGGED_OUT
+     *  - BOTH
+     * $auth_level defaults to BOTH
+     *
+     * @throws Exception If the class' $action value hasn't been set
+     *
+     * @param int $auth_level The authentication level to use (see above)
+     */
+    public function __construct( $auth_level = self::BOTH ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        if ( empty( $this->action ) ) {
+            throw new Exception( 'Action not defined for class ' . __CLASS__ );
+        }
+        add_action( $this->action, array(
+            $this,
+            'launch',
+        ), (int) $this->priority, (int) $this->argument_count );
+        if ( $auth_level & self::LOGGED_IN ) {
+            add_action( "admin_post_wl_async_$this->action", array(
+                $this,
+                'handle_postback',
+            ) );
+        }
+        if ( $auth_level & self::LOGGED_OUT ) {
+            add_action( "admin_post_nopriv_wl_async_$this->action", array(
+                $this,
+                'handle_postback',
+            ) );
+        }
+    }
+
+    /**
+     * Add the shutdown action for launching the real postback if we don't
+     * get an exception thrown by prepare_data().
+     *
+     * @uses func_get_args() To grab any arguments passed by the action
+     */
+    public function launch() {
+        $data = func_get_args();
+        try {
+            $data = $this->prepare_data( $data );
+        } catch ( Exception $e ) {
+            return;
+        }
+
+        $data['action'] = "wl_async_$this->action";
+        $data['_nonce'] = $this->create_async_nonce();
+
+        $this->_body_data = $data;
+
+        if ( ! has_action( 'shutdown', array(
+            $this,
+            'launch_on_shutdown',
+        ) )
+        ) {
+            add_action( 'shutdown', array( $this, 'launch_on_shutdown' ) );
+        }
+    }
+
+    /**
+     * Launch the request on the WordPress shutdown hook
+     *
+     * On VIP we got into data races due to the postback sometimes completing
+     * faster than the data could propogate to the database server cluster.
+     * This made WordPress get empty data sets from the database without
+     * failing. On their advice, we're moving the actual firing of the async
+     * postback to the shutdown hook. Supposedly that will ensure that the
+     * data at least has time to get into the object cache.
+     *
+     * @uses $_COOKIE        To send a cookie header for async postback
+     * @uses apply_filters()
+     * @uses admin_url()
+     * @uses wp_remote_post()
+     */
+    public function launch_on_shutdown() {
+
+        $this->log->debug( "Launching Async Task [ action :: $this->action ]..." );
+
+        if ( ! empty( $this->_body_data ) ) {
+            $cookies = array();
+            foreach ( $_COOKIE as $name => $value ) {
+                $cookies[] = "$name=" . urlencode( is_array( $value ) ? serialize( $value ) : $value );
+            }
+
+            $request_args = array(
+                'timeout'   => 0.01,
+                'blocking'  => false,
+                'sslverify' => apply_filters( 'https_local_ssl_verify', false ),
+                'body'      => $this->_body_data,
+                'headers'   => array(
+                    'cookie' => implode( '; ', $cookies ),
+                ),
+            );
+
+            $url = get_site_url( null, 'wl-api' );
+
+            $this->log->debug( "Posting URL $url..." );
+
+            $result = wp_remote_post( $url, $request_args );
+
+            if ( is_wp_error( $result ) ) {
+                $this->log->error( 'Posting URL returned an error: ' . $result->get_error_message() );
+            }
+
+        }
+    }
+
+    /**
+     * Verify the postback is valid, then fire any scheduled events.
+     *
+     * @uses $_POST['_nonce']
+     * @uses is_user_logged_in()
+     * @uses add_filter()
+     * @uses wp_die()
+     */
+    public function handle_postback() {
+        if ( isset( $_POST['_nonce'] ) && $this->verify_async_nonce( (string) $_POST['_nonce'] ) ) {
+            if ( ! is_user_logged_in() ) {
+                $this->action = "nopriv_$this->action";
+            }
+            $this->run_action();
+        }
+    }
+
+    /**
+     * Create a random, one time use token.
+     *
+     * Based entirely on wp_create_nonce() but does not tie the nonce to the
+     * current logged-in user.
+     *
+     * @uses wp_nonce_tick()
+     * @uses wp_hash()
+     *
+     * @return string The one-time use token
+     */
+    protected function create_async_nonce() {
+        $action = $this->get_nonce_action();
+        $i      = wp_nonce_tick();
+
+        return substr( wp_hash( $i . $action . get_class( $this ), 'nonce' ), - 12, 10 );
+    }
+
+    /**
+     * Verify that the correct nonce was used within the time limit.
+     *
+     * @uses wp_nonce_tick()
+     * @uses wp_hash()
+     *
+     * @param string $nonce Nonce to be verified
+     *
+     * @return bool Whether the nonce check passed or failed
+     */
+    protected function verify_async_nonce( $nonce ) {
+        $action = $this->get_nonce_action();
+        $i      = wp_nonce_tick();
+
+        // Nonce generated 0-12 hours ago
+        if ( substr( wp_hash( $i . $action . get_class( $this ), 'nonce' ), - 12, 10 ) == $nonce ) {
+            return 1;
+        }
+
+        // Nonce generated 12-24 hours ago
+        if ( substr( wp_hash( ( $i - 1 ) . $action . get_class( $this ), 'nonce' ), - 12, 10 ) == $nonce ) {
+            return 2;
+        }
+
+        // Invalid nonce
+        return false;
+    }
+
+    /**
+     * Get a nonce action based on the $action property of the class
+     *
+     * @return string The nonce action for the current instance
+     */
+    protected function get_nonce_action() {
+        $action = $this->action;
+        if ( substr( $action, 0, 7 ) === 'nopriv_' ) {
+            $action = substr( $action, 7 );
+        }
+        $action = "wl_async_$action";
+
+        return $action;
+    }
+
+    /**
+     * Prepare any data to be passed to the asynchronous postback
+     *
+     * The array this function receives will be a numerically keyed array from
+     * func_get_args(). It is expected that you will return an associative array
+     * so that the $_POST values used in the asynchronous call will make sense.
+     *
+     * The array you send back may or may not have anything to do with the data
+     * passed into this method. It all depends on the implementation details and
+     * what data is needed in the asynchronous postback.
+     *
+     * Do not set values for 'action' or '_nonce', as those will get overwritten
+     * later in launch().
+     *
+     * @throws Exception If the postback should not occur for any reason
+     *
+     * @param array $data The raw data received by the launch method
+     *
+     * @return array The prepared data
+     */
+    abstract protected function prepare_data( $data );
+
+    /**
+     * Run the do_action function for the asynchronous postback.
+     *
+     * This method needs to fetch and sanitize any and all data from the $_POST
+     * superglobal and provide them to the do_action call.
+     *
+     * The action should be constructed as "wl_async_task_$this->action"
+     */
+    abstract protected function run_action();
 
 }
 

Spacing +37 added lines, -37 removed lines

@@ -81,28 +81,28 @@ 
 	 *
 	 * @param int $auth_level The authentication level to use (see above)
 	 */
-	public function __construct( $auth_level = self::BOTH ) {
+	public function __construct($auth_level = self::BOTH) {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
-		if ( empty( $this->action ) ) {
-			throw new Exception( 'Action not defined for class ' . __CLASS__ );
+		if (empty($this->action)) {
+			throw new Exception('Action not defined for class '.__CLASS__);
 		}
-		add_action( $this->action, array(
+		add_action($this->action, array(
 			$this,
 			'launch',
-		), (int) $this->priority, (int) $this->argument_count );
-		if ( $auth_level & self::LOGGED_IN ) {
-			add_action( "admin_post_wl_async_$this->action", array(
+		), (int) $this->priority, (int) $this->argument_count);
+		if ($auth_level & self::LOGGED_IN) {
+			add_action("admin_post_wl_async_$this->action", array(
 				$this,
 				'handle_postback',
-			) );
+			));
 		}
-		if ( $auth_level & self::LOGGED_OUT ) {
-			add_action( "admin_post_nopriv_wl_async_$this->action", array(
+		if ($auth_level & self::LOGGED_OUT) {
+			add_action("admin_post_nopriv_wl_async_$this->action", array(
 				$this,
 				'handle_postback',
-			) );
+			));
 		}
 	}
 
@@ -115,8 +115,8 @@ 
 	public function launch() {
 		$data = func_get_args();
 		try {
-			$data = $this->prepare_data( $data );
-		} catch ( Exception $e ) {
+			$data = $this->prepare_data($data);
+		} catch (Exception $e) {
 			return;
 		}
 
@@ -125,12 +125,12 @@ 
 
 		$this->_body_data = $data;
 
-		if ( ! has_action( 'shutdown', array(
+		if ( ! has_action('shutdown', array(
 			$this,
 			'launch_on_shutdown',
-		) )
+		))
 		) {
-			add_action( 'shutdown', array( $this, 'launch_on_shutdown' ) );
+			add_action('shutdown', array($this, 'launch_on_shutdown'));
 		}
 	}
 
@@ -151,32 +151,32 @@ 
 	 */
 	public function launch_on_shutdown() {
 
-		$this->log->debug( "Launching Async Task [ action :: $this->action ]..." );
+		$this->log->debug("Launching Async Task [ action :: $this->action ]...");
 
-		if ( ! empty( $this->_body_data ) ) {
+		if ( ! empty($this->_body_data)) {
 			$cookies = array();
-			foreach ( $_COOKIE as $name => $value ) {
-				$cookies[] = "$name=" . urlencode( is_array( $value ) ? serialize( $value ) : $value );
+			foreach ($_COOKIE as $name => $value) {
+				$cookies[] = "$name=".urlencode(is_array($value) ? serialize($value) : $value);
 			}
 
 			$request_args = array(
 				'timeout'   => 0.01,
 				'blocking'  => false,
-				'sslverify' => apply_filters( 'https_local_ssl_verify', false ),
+				'sslverify' => apply_filters('https_local_ssl_verify', false),
 				'body'      => $this->_body_data,
 				'headers'   => array(
-					'cookie' => implode( '; ', $cookies ),
+					'cookie' => implode('; ', $cookies),
 				),
 			);
 
-			$url = get_site_url( null, 'wl-api' );
+			$url = get_site_url(null, 'wl-api');
 
-			$this->log->debug( "Posting URL $url..." );
+			$this->log->debug("Posting URL $url...");
 
-			$result = wp_remote_post( $url, $request_args );
+			$result = wp_remote_post($url, $request_args);
 
-			if ( is_wp_error( $result ) ) {
-				$this->log->error( 'Posting URL returned an error: ' . $result->get_error_message() );
+			if (is_wp_error($result)) {
+				$this->log->error('Posting URL returned an error: '.$result->get_error_message());
 			}
 
 		}
@@ -191,8 +191,8 @@ 
 	 * @uses wp_die()
 	 */
 	public function handle_postback() {
-		if ( isset( $_POST['_nonce'] ) && $this->verify_async_nonce( (string) $_POST['_nonce'] ) ) {
-			if ( ! is_user_logged_in() ) {
+		if (isset($_POST['_nonce']) && $this->verify_async_nonce((string) $_POST['_nonce'])) {
+			if ( ! is_user_logged_in()) {
 				$this->action = "nopriv_$this->action";
 			}
 			$this->run_action();
@@ -214,7 +214,7 @@ 
 		$action = $this->get_nonce_action();
 		$i      = wp_nonce_tick();
 
-		return substr( wp_hash( $i . $action . get_class( $this ), 'nonce' ), - 12, 10 );
+		return substr(wp_hash($i.$action.get_class($this), 'nonce'), - 12, 10);
 	}
 
 	/**
@@ -227,17 +227,17 @@ 
 	 *
 	 * @return bool Whether the nonce check passed or failed
 	 */
-	protected function verify_async_nonce( $nonce ) {
+	protected function verify_async_nonce($nonce) {
 		$action = $this->get_nonce_action();
 		$i      = wp_nonce_tick();
 
 		// Nonce generated 0-12 hours ago
-		if ( substr( wp_hash( $i . $action . get_class( $this ), 'nonce' ), - 12, 10 ) == $nonce ) {
+		if (substr(wp_hash($i.$action.get_class($this), 'nonce'), - 12, 10) == $nonce) {
 			return 1;
 		}
 
 		// Nonce generated 12-24 hours ago
-		if ( substr( wp_hash( ( $i - 1 ) . $action . get_class( $this ), 'nonce' ), - 12, 10 ) == $nonce ) {
+		if (substr(wp_hash(($i - 1).$action.get_class($this), 'nonce'), - 12, 10) == $nonce) {
 			return 2;
 		}
 
@@ -252,8 +252,8 @@ 
 	 */
 	protected function get_nonce_action() {
 		$action = $this->action;
-		if ( substr( $action, 0, 7 ) === 'nopriv_' ) {
-			$action = substr( $action, 7 );
+		if (substr($action, 0, 7) === 'nopriv_') {
+			$action = substr($action, 7);
 		}
 		$action = "wl_async_$action";
 
@@ -280,7 +280,7 @@ 
 	 *
 	 * @return array The prepared data
 	 */
-	abstract protected function prepare_data( $data );
+	abstract protected function prepare_data($data);
 
 	/**
 	 * Run the do_action function for the asynchronous postback.

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

Indentation +610 added lines, -610 removed lines

@@ -18,534 +18,534 @@ 
  */
 class Wordlift_Entity_Service {
 
-	/**
-	 * The Log service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log The Log service.
-	 */
-	private $log;
-
-	/**
-	 * The UI service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_UI_Service $ui_service The UI service.
-	 */
-	private $ui_service;
-
-	/**
-	 * The {@link Wordlift_Relation_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
-	 */
-	private $relation_service;
-
-	/**
-	 * The {@link Wordlift_Entity_Uri_Service} instance.
-	 *
-	 * @since  3.16.3
-	 * @access private
-	 * @var \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
-	 */
-	private $entity_uri_service;
-
-	/**
-	 * The entity post type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const TYPE_NAME = 'entity';
-
-	/**
-	 * The alternative label meta key.
-	 *
-	 * @since 3.2.0
-	 */
-	const ALTERNATIVE_LABEL_META_KEY = '_wl_alt_label';
-
-	/**
-	 * The alternative label input template.
-	 *
-	 * @since 3.2.0
-	 */
-	// TODO: this should be moved to a class that deals with HTML code.
-	const ALTERNATIVE_LABEL_INPUT_TEMPLATE = '<div class="wl-alternative-label">
+    /**
+     * The Log service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_Log_Service $log The Log service.
+     */
+    private $log;
+
+    /**
+     * The UI service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_UI_Service $ui_service The UI service.
+     */
+    private $ui_service;
+
+    /**
+     * The {@link Wordlift_Relation_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
+     */
+    private $relation_service;
+
+    /**
+     * The {@link Wordlift_Entity_Uri_Service} instance.
+     *
+     * @since  3.16.3
+     * @access private
+     * @var \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
+     */
+    private $entity_uri_service;
+
+    /**
+     * The entity post type name.
+     *
+     * @since 3.1.0
+     */
+    const TYPE_NAME = 'entity';
+
+    /**
+     * The alternative label meta key.
+     *
+     * @since 3.2.0
+     */
+    const ALTERNATIVE_LABEL_META_KEY = '_wl_alt_label';
+
+    /**
+     * The alternative label input template.
+     *
+     * @since 3.2.0
+     */
+    // TODO: this should be moved to a class that deals with HTML code.
+    const ALTERNATIVE_LABEL_INPUT_TEMPLATE = '<div class="wl-alternative-label">
                 <label class="screen-reader-text" id="wl-alternative-label-prompt-text" for="wl-alternative-label">Enter alternative label here</label>
                 <input name="wl_alternative_label[]" size="30" value="%s" id="wl-alternative-label" type="text">
                 <button class="button wl-delete-button">%s</button>
                 </div>';
 
-	/**
-	 * A singleton instance of the Entity service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $instance A singleton instance of the Entity service.
-	 */
-	private static $instance;
-
-	/**
-	 * Create a Wordlift_Entity_Service instance.
-	 *
-	 * @param \Wordlift_UI_Service $ui_service The UI service.
-	 * @param \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
-	 * @param \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
-	 *
-	 * @since 3.2.0
-	 *
-	 */
-	public function __construct( $ui_service, $relation_service, $entity_uri_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
-
-		$this->ui_service         = $ui_service;
-		$this->relation_service   = $relation_service;
-		$this->entity_uri_service = $entity_uri_service;
-
-		// Set the singleton instance.
-		self::$instance = $this;
-	}
-
-	/**
-	 * Get the singleton instance of the Entity service.
-	 *
-	 * @return \Wordlift_Entity_Service The singleton instance of the Entity service.
-	 * @since 3.2.0
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Determines whether a post is an entity or not. Entity is in this context
-	 * something which is not an article.
-	 *
-	 * @param int $post_id A post id.
-	 *
-	 * @return bool Return true if the post is an entity otherwise false.
-	 * @since 3.1.0
-	 *
-	 */
-	public function is_entity( $post_id ) {
-
-		$terms = wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-
-		if ( is_wp_error( $terms ) ) {
-			$this->log->error( "Cannot get the terms for post $post_id: " . $terms->get_error_message() );
-
-			return false;
-		}
-
-		if ( empty( $terms ) ) {
-			return false;
-		}
-
-		/*
+    /**
+     * A singleton instance of the Entity service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_Entity_Service $instance A singleton instance of the Entity service.
+     */
+    private static $instance;
+
+    /**
+     * Create a Wordlift_Entity_Service instance.
+     *
+     * @param \Wordlift_UI_Service $ui_service The UI service.
+     * @param \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
+     * @param \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
+     *
+     * @since 3.2.0
+     *
+     */
+    public function __construct( $ui_service, $relation_service, $entity_uri_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
+
+        $this->ui_service         = $ui_service;
+        $this->relation_service   = $relation_service;
+        $this->entity_uri_service = $entity_uri_service;
+
+        // Set the singleton instance.
+        self::$instance = $this;
+    }
+
+    /**
+     * Get the singleton instance of the Entity service.
+     *
+     * @return \Wordlift_Entity_Service The singleton instance of the Entity service.
+     * @since 3.2.0
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Determines whether a post is an entity or not. Entity is in this context
+     * something which is not an article.
+     *
+     * @param int $post_id A post id.
+     *
+     * @return bool Return true if the post is an entity otherwise false.
+     * @since 3.1.0
+     *
+     */
+    public function is_entity( $post_id ) {
+
+        $terms = wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+
+        if ( is_wp_error( $terms ) ) {
+            $this->log->error( "Cannot get the terms for post $post_id: " . $terms->get_error_message() );
+
+            return false;
+        }
+
+        if ( empty( $terms ) ) {
+            return false;
+        }
+
+        /*
 		 * We don't consider an `article` to be an entity.
 		 *
 		 * @since 3.20.0 At least one associated mustn't be an `article`.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
-		foreach ( $terms as $term ) {
-			if ( 1 !== preg_match( '~(^|-)article$~', $term->slug ) ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get the proper classification scope for a given entity post
-	 *
-	 * @param integer $post_id An entity post id.
-	 *
-	 * @param string $default The default classification scope, `what` if not
-	 *                         provided.
-	 *
-	 * @return string Returns a classification scope (e.g. 'what').
-	 * @since 3.5.0
-	 *
-	 */
-	public function get_classification_scope_for( $post_id, $default = WL_WHAT_RELATION ) {
-
-		if ( false === $this->is_entity( $post_id ) ) {
-			return $default;
-		}
-
-		// Retrieve the entity type
-		$entity_type_arr = Wordlift_Entity_Type_Service::get_instance()->get( $post_id );
-		$entity_type     = str_replace( 'wl-', '', $entity_type_arr['css_class'] );
-		// Retrieve classification boxes configuration
-		$classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
-		foreach ( $classification_boxes as $cb ) {
-			if ( in_array( $entity_type, $cb['registeredTypes'] ) ) {
-				return $cb['id'];
-			}
-		}
-
-		return $default;
-	}
-
-	/**
-	 * Check whether a {@link WP_Post} is used.
-	 *
-	 * @param int $post_id The {@link WP_Post}'s id.
-	 *
-	 * @return bool|null Null if it's not an entity, otherwise true if it's used.
-	 */
-	public function is_used( $post_id ) {
-
-		if ( false === $this->is_entity( $post_id ) ) {
-			return null;
-		}
-		// Retrieve the post
-		$entity = get_post( $post_id );
-
-		global $wpdb;
-		// Retrieve Wordlift relation instances table name
-		$table_name = wl_core_get_relation_instances_table_name();
-
-		// Check is it's referenced / related to another post / entity
-		$stmt = $wpdb->prepare(
-			"SELECT COUNT(*) FROM $table_name WHERE  object_id = %d",
-			$entity->ID
-		);
-
-		// Perform the query
-		$relation_instances = (int) $wpdb->get_var( $stmt );
-		// If there is at least one relation instance for the current entity, then it's used
-		if ( 0 < $relation_instances ) {
-			return true;
-		}
-
-		// Check if the entity uri is used as meta_value
-		$stmt = $wpdb->prepare(
-			"SELECT COUNT(*) FROM $wpdb->postmeta WHERE post_id != %d AND meta_value = %s",
-			$entity->ID,
-			wl_get_entity_uri( $entity->ID )
-		);
-		// Perform the query
-		$meta_instances = (int) $wpdb->get_var( $stmt );
-
-		// If there is at least one meta that refers the current entity uri, then current entity is used
-		if ( 0 < $meta_instances ) {
-			return true;
-		}
-
-		// If we are here, it means the current entity is not used at the moment
-		return false;
-	}
-
-	/**
-	 * Find entity posts by the entity URI. Entity as searched by their entity URI or same as.
-	 *
-	 * @param string $uri The entity URI.
-	 *
-	 * @return WP_Post|null A WP_Post instance or null if not found.
-	 * @deprecated in favor of Wordlift_Entity_Uri_Service->get_entity( $uri );
-	 *
-	 * @since      3.16.3 deprecated in favor of Wordlift_Entity_Uri_Service->get_entity( $uri );
-	 * @since      3.2.0
-	 *
-	 */
-	public function get_entity_post_by_uri( $uri ) {
-
-		return $this->entity_uri_service->get_entity( $uri );
-	}
-
-	/**
-	 * Fires once a post has been saved. This function uses the $_REQUEST, therefore
-	 * we check that the post we're saving is the current post.
-	 *
-	 * @see   https://github.com/insideout10/wordlift-plugin/issues/363
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param int $post_id Post ID.
-	 * @param WP_Post $post Post object.
-	 * @param bool $update Whether this is an existing post being updated or not.
-	 */
-	public function save_post( $post_id, $post, $update ) {
-
-		// Avoid doing anything if post is autosave or a revision.
-		if ( wp_is_post_autosave( $post ) || wp_is_post_revision( $post ) ) {
-			return;
-		}
-
-		// We're setting the alternative label that have been provided via the UI
-		// (in fact we're using $_REQUEST), while save_post may be also called
-		// programmatically by some other function: we need to check therefore if
-		// the $post_id in the save_post call matches the post id set in the request.
-		//
-		// If this is not the current post being saved or if it's not an entity, return.
-		if ( ! isset( $_REQUEST['post_ID'] ) || $_REQUEST['post_ID'] != $post_id || ! $this->is_entity( $post_id ) ) {
-			return;
-		}
-
-		// Get the alt labels from the request (or empty array).
-		$alt_labels = isset( $_REQUEST['wl_alternative_label'] ) ? (array) $_REQUEST['wl_alternative_label'] : array();
-
-		if ( ( ! empty( $_POST['content'] ) && ! empty( $_POST['post_content'] ) ) || isset( $_REQUEST['wl_alternative_label'] ) ) {
-			// This is via classic editor, so set the alternative labels.
-			$this->set_alternative_labels( $post_id, $alt_labels );
-		}
-
-
-	}
-
-	/**
-	 * Set the alternative labels.
-	 *
-	 * @param int $post_id The post id.
-	 * @param array $alt_labels An array of labels.
-	 *
-	 * @since 3.2.0
-	 *
-	 */
-	public function set_alternative_labels( $post_id, $alt_labels ) {
-
-		// Bail out if post id is not numeric. We add this check as we found a WP install that was sending a WP_Error
-		// instead of post id.
-		if ( ! is_numeric( $post_id ) ) {
-			return;
-		}
-
-		// Force $alt_labels to be an array
-		if ( ! is_array( $alt_labels ) ) {
-			$alt_labels = array( $alt_labels );
-		}
-
-		$this->log->debug( "Setting alternative labels [ post id :: $post_id ][ alt labels :: " . implode( ',', $alt_labels ) . " ]" );
-
-		// Delete all the existing alternate labels.
-		delete_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
-
-		// Set the alternative labels.
-		foreach ( $alt_labels as $alt_label ) {
-			if ( ! empty( $alt_label ) ) {
-				add_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY, (string) $alt_label );
-			}
-		}
-
-	}
-
-	/**
-	 * Retrieve the alternate labels.
-	 *
-	 * @param int $post_id Post id.
-	 *
-	 * @return mixed An array  of alternative labels.
-	 * @since 3.2.0
-	 *
-	 */
-	public function get_alternative_labels( $post_id ) {
-
-		return get_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
-	}
-
-	/**
-	 * Retrieve the labels for an entity, i.e. the title + the synonyms.
-	 *
-	 * @param int $post_id The entity {@link WP_Post} id.
-	 * @param int $object_type The object type {@link Object_Type_Enum}
-	 *
-	 * @return array An array with the entity title and labels.
-	 * @since 3.12.0
-	 */
-	public function get_labels( $post_id, $object_type = Object_Type_Enum::POST ) {
-		if ( $object_type === Object_Type_Enum::POST ) {
-			return array_merge( (array) get_the_title( $post_id ), $this->get_alternative_labels( $post_id ) );
-		}
-		// Term Reference dont have synonyms yet.
-		return array();
-	}
-
-	/**
-	 * Fires before the permalink field in the edit form (this event is available in WP from 4.1.0).
-	 *
-	 * @param WP_Post $post Post object.
-	 *
-	 * @since 3.2.0
-	 *
-	 */
-	public function edit_form_before_permalink( $post ) {
-
-		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post->ID ) ) {
-			return;
-		}
-
-		// If disabled by filter, return.
-		if ( ! apply_filters( 'wl_feature__enable__add-synonyms', true ) ) {
-			return;
-		}
-
-		// Print the input template.
-		$this->ui_service->print_template( 'wl-tmpl-alternative-label-input', $this->get_alternative_label_input() );
-
-		// Print all the currently set alternative labels.
-		foreach ( $this->get_alternative_labels( $post->ID ) as $alt_label ) {
-
-			echo $this->get_alternative_label_input( $alt_label );
-
-		};
-
-		// Print the button.
-		$this->ui_service->print_button( 'wl-add-alternative-labels-button', __( 'Add more titles', 'wordlift' ) );
-
-	}
-
-	/**
-	 * Get the URI for the entity with the specified post id.
-	 *
-	 * @param int $post_id The entity post id.
-	 *
-	 * @return null|string The entity URI or NULL if not found or the dataset URI is not configured.
-	 * @since 3.6.0
-	 *
-	 */
-	private function get_uri_for_post( $post_id ) {
-
-		$log = Wordlift_Log_Service::get_logger( get_class() );
-
-		// If a null is given, nothing to do
-		if ( is_null( $post_id ) ) {
-			return null;
-		}
-
-		$dataset_uri = wl_configuration_get_redlink_dataset_uri();
-
-		if ( empty( $dataset_uri ) ) {
-			// Continue even if the dataset uri is not properly configured. It is handled in function wl_build_entity_uri()
-			$log->debug( 'Continuing, dataset uri not configured...' );
-		}
-
-		$uri = get_post_meta( $post_id, WL_ENTITY_URL_META_NAME, true );
-
-		/*
+        foreach ( $terms as $term ) {
+            if ( 1 !== preg_match( '~(^|-)article$~', $term->slug ) ) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the proper classification scope for a given entity post
+     *
+     * @param integer $post_id An entity post id.
+     *
+     * @param string $default The default classification scope, `what` if not
+     *                         provided.
+     *
+     * @return string Returns a classification scope (e.g. 'what').
+     * @since 3.5.0
+     *
+     */
+    public function get_classification_scope_for( $post_id, $default = WL_WHAT_RELATION ) {
+
+        if ( false === $this->is_entity( $post_id ) ) {
+            return $default;
+        }
+
+        // Retrieve the entity type
+        $entity_type_arr = Wordlift_Entity_Type_Service::get_instance()->get( $post_id );
+        $entity_type     = str_replace( 'wl-', '', $entity_type_arr['css_class'] );
+        // Retrieve classification boxes configuration
+        $classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
+        foreach ( $classification_boxes as $cb ) {
+            if ( in_array( $entity_type, $cb['registeredTypes'] ) ) {
+                return $cb['id'];
+            }
+        }
+
+        return $default;
+    }
+
+    /**
+     * Check whether a {@link WP_Post} is used.
+     *
+     * @param int $post_id The {@link WP_Post}'s id.
+     *
+     * @return bool|null Null if it's not an entity, otherwise true if it's used.
+     */
+    public function is_used( $post_id ) {
+
+        if ( false === $this->is_entity( $post_id ) ) {
+            return null;
+        }
+        // Retrieve the post
+        $entity = get_post( $post_id );
+
+        global $wpdb;
+        // Retrieve Wordlift relation instances table name
+        $table_name = wl_core_get_relation_instances_table_name();
+
+        // Check is it's referenced / related to another post / entity
+        $stmt = $wpdb->prepare(
+            "SELECT COUNT(*) FROM $table_name WHERE  object_id = %d",
+            $entity->ID
+        );
+
+        // Perform the query
+        $relation_instances = (int) $wpdb->get_var( $stmt );
+        // If there is at least one relation instance for the current entity, then it's used
+        if ( 0 < $relation_instances ) {
+            return true;
+        }
+
+        // Check if the entity uri is used as meta_value
+        $stmt = $wpdb->prepare(
+            "SELECT COUNT(*) FROM $wpdb->postmeta WHERE post_id != %d AND meta_value = %s",
+            $entity->ID,
+            wl_get_entity_uri( $entity->ID )
+        );
+        // Perform the query
+        $meta_instances = (int) $wpdb->get_var( $stmt );
+
+        // If there is at least one meta that refers the current entity uri, then current entity is used
+        if ( 0 < $meta_instances ) {
+            return true;
+        }
+
+        // If we are here, it means the current entity is not used at the moment
+        return false;
+    }
+
+    /**
+     * Find entity posts by the entity URI. Entity as searched by their entity URI or same as.
+     *
+     * @param string $uri The entity URI.
+     *
+     * @return WP_Post|null A WP_Post instance or null if not found.
+     * @deprecated in favor of Wordlift_Entity_Uri_Service->get_entity( $uri );
+     *
+     * @since      3.16.3 deprecated in favor of Wordlift_Entity_Uri_Service->get_entity( $uri );
+     * @since      3.2.0
+     *
+     */
+    public function get_entity_post_by_uri( $uri ) {
+
+        return $this->entity_uri_service->get_entity( $uri );
+    }
+
+    /**
+     * Fires once a post has been saved. This function uses the $_REQUEST, therefore
+     * we check that the post we're saving is the current post.
+     *
+     * @see   https://github.com/insideout10/wordlift-plugin/issues/363
+     *
+     * @since 3.2.0
+     *
+     * @param int $post_id Post ID.
+     * @param WP_Post $post Post object.
+     * @param bool $update Whether this is an existing post being updated or not.
+     */
+    public function save_post( $post_id, $post, $update ) {
+
+        // Avoid doing anything if post is autosave or a revision.
+        if ( wp_is_post_autosave( $post ) || wp_is_post_revision( $post ) ) {
+            return;
+        }
+
+        // We're setting the alternative label that have been provided via the UI
+        // (in fact we're using $_REQUEST), while save_post may be also called
+        // programmatically by some other function: we need to check therefore if
+        // the $post_id in the save_post call matches the post id set in the request.
+        //
+        // If this is not the current post being saved or if it's not an entity, return.
+        if ( ! isset( $_REQUEST['post_ID'] ) || $_REQUEST['post_ID'] != $post_id || ! $this->is_entity( $post_id ) ) {
+            return;
+        }
+
+        // Get the alt labels from the request (or empty array).
+        $alt_labels = isset( $_REQUEST['wl_alternative_label'] ) ? (array) $_REQUEST['wl_alternative_label'] : array();
+
+        if ( ( ! empty( $_POST['content'] ) && ! empty( $_POST['post_content'] ) ) || isset( $_REQUEST['wl_alternative_label'] ) ) {
+            // This is via classic editor, so set the alternative labels.
+            $this->set_alternative_labels( $post_id, $alt_labels );
+        }
+
+
+    }
+
+    /**
+     * Set the alternative labels.
+     *
+     * @param int $post_id The post id.
+     * @param array $alt_labels An array of labels.
+     *
+     * @since 3.2.0
+     *
+     */
+    public function set_alternative_labels( $post_id, $alt_labels ) {
+
+        // Bail out if post id is not numeric. We add this check as we found a WP install that was sending a WP_Error
+        // instead of post id.
+        if ( ! is_numeric( $post_id ) ) {
+            return;
+        }
+
+        // Force $alt_labels to be an array
+        if ( ! is_array( $alt_labels ) ) {
+            $alt_labels = array( $alt_labels );
+        }
+
+        $this->log->debug( "Setting alternative labels [ post id :: $post_id ][ alt labels :: " . implode( ',', $alt_labels ) . " ]" );
+
+        // Delete all the existing alternate labels.
+        delete_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
+
+        // Set the alternative labels.
+        foreach ( $alt_labels as $alt_label ) {
+            if ( ! empty( $alt_label ) ) {
+                add_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY, (string) $alt_label );
+            }
+        }
+
+    }
+
+    /**
+     * Retrieve the alternate labels.
+     *
+     * @param int $post_id Post id.
+     *
+     * @return mixed An array  of alternative labels.
+     * @since 3.2.0
+     *
+     */
+    public function get_alternative_labels( $post_id ) {
+
+        return get_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
+    }
+
+    /**
+     * Retrieve the labels for an entity, i.e. the title + the synonyms.
+     *
+     * @param int $post_id The entity {@link WP_Post} id.
+     * @param int $object_type The object type {@link Object_Type_Enum}
+     *
+     * @return array An array with the entity title and labels.
+     * @since 3.12.0
+     */
+    public function get_labels( $post_id, $object_type = Object_Type_Enum::POST ) {
+        if ( $object_type === Object_Type_Enum::POST ) {
+            return array_merge( (array) get_the_title( $post_id ), $this->get_alternative_labels( $post_id ) );
+        }
+        // Term Reference dont have synonyms yet.
+        return array();
+    }
+
+    /**
+     * Fires before the permalink field in the edit form (this event is available in WP from 4.1.0).
+     *
+     * @param WP_Post $post Post object.
+     *
+     * @since 3.2.0
+     *
+     */
+    public function edit_form_before_permalink( $post ) {
+
+        // If it's not an entity, return.
+        if ( ! $this->is_entity( $post->ID ) ) {
+            return;
+        }
+
+        // If disabled by filter, return.
+        if ( ! apply_filters( 'wl_feature__enable__add-synonyms', true ) ) {
+            return;
+        }
+
+        // Print the input template.
+        $this->ui_service->print_template( 'wl-tmpl-alternative-label-input', $this->get_alternative_label_input() );
+
+        // Print all the currently set alternative labels.
+        foreach ( $this->get_alternative_labels( $post->ID ) as $alt_label ) {
+
+            echo $this->get_alternative_label_input( $alt_label );
+
+        };
+
+        // Print the button.
+        $this->ui_service->print_button( 'wl-add-alternative-labels-button', __( 'Add more titles', 'wordlift' ) );
+
+    }
+
+    /**
+     * Get the URI for the entity with the specified post id.
+     *
+     * @param int $post_id The entity post id.
+     *
+     * @return null|string The entity URI or NULL if not found or the dataset URI is not configured.
+     * @since 3.6.0
+     *
+     */
+    private function get_uri_for_post( $post_id ) {
+
+        $log = Wordlift_Log_Service::get_logger( get_class() );
+
+        // If a null is given, nothing to do
+        if ( is_null( $post_id ) ) {
+            return null;
+        }
+
+        $dataset_uri = wl_configuration_get_redlink_dataset_uri();
+
+        if ( empty( $dataset_uri ) ) {
+            // Continue even if the dataset uri is not properly configured. It is handled in function wl_build_entity_uri()
+            $log->debug( 'Continuing, dataset uri not configured...' );
+        }
+
+        $uri = get_post_meta( $post_id, WL_ENTITY_URL_META_NAME, true );
+
+        /*
 		 * Consider the URI invalid if it doesn't start with the dataset URI.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/996
 		 */
-		if ( empty( $dataset_uri ) || 0 !== strpos( $uri, $dataset_uri ) ) {
-			$uri = null;
-		}
-
-		// Set the URI if it isn't set yet.
-		$post_status = get_post_status( $post_id );
-		if ( empty( $uri ) && 'auto-draft' !== $post_status && 'inherit' !== $post_status ) {
-			$uri = wl_build_entity_uri( $post_id );
-			wl_set_entity_uri( $post_id, $uri );
-		}
-
-		return $uri;
-	}
-
-	public function get_uri( $object_id, $type = Object_Type_Enum::POST ) {
-
-		if ( Object_Type_Enum::POST === $type ) {
-			return $this->get_uri_for_post( $object_id );
-		}
-
-		if ( Object_Type_Enum::USER === $type ) {
-			$uri = Wordlift_User_Service::get_instance()->get_uri( $object_id );
-
-			return ( false === $uri ? null : $uri );
-		}
-
-		if ( Object_Type_Enum::TERM === $type ) {
-			return wl_get_term_entity_uri( $object_id );
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get the alternative label input HTML code.
-	 *
-	 * @param string $value The input value.
-	 *
-	 * @return string The input HTML code.
-	 * @since 3.2.0
-	 *
-	 */
-	private function get_alternative_label_input( $value = '' ) {
-
-		return sprintf( self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr( $value ), __( 'Delete', 'wordlift' ) );
-	}
-
-	/**
-	 * Get the number of entity posts published in this blog.
-	 *
-	 * @return int The number of published entity posts.
-	 * @since 3.6.0
-	 *
-	 */
-	public function count() {
-		global $wpdb;
-
-		// Try to get the count from the transient.
-		$count = get_transient( '_wl_entity_service__count' );
-		if ( false !== $count ) {
-			return $count;
-		}
-
-		// Query the count.
-		$count = $wpdb->get_var( $wpdb->prepare(
-			"SELECT COUNT( DISTINCT( tr.object_id ) )"
-			. " FROM {$wpdb->term_relationships} tr"
-			. " INNER JOIN {$wpdb->term_taxonomy} tt"
-			. "  ON tt.taxonomy = %s AND tt.term_taxonomy_id = tr.term_taxonomy_id"
-			. " INNER JOIN {$wpdb->terms} t"
-			. "  ON t.term_id = tt.term_id AND t.name != %s",
-			Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-			'article'
-		) );
-
-		// Store the count in cache.
-		set_transient( '_wl_entity_service__count', $count, 900 );
-
-		return $count;
-	}
-
-	/**
-	 * Add the entity filtering criterias to the arguments for a `get_posts`
-	 * call.
-	 *
-	 * @param array $args The arguments for a `get_posts` call.
-	 *
-	 * @return array The arguments for a `get_posts` call.
-	 * @since 3.15.0
-	 *
-	 */
-	public static function add_criterias( $args ) {
-
-		// Build an optimal tax-query.
-		$tax_query = array(
-			'relation' => 'AND',
-			array(
-				'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-				'operator' => 'EXISTS',
-			),
-			array(
-				'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-				'field'    => 'slug',
-				'terms'    => 'article',
-				'operator' => 'NOT IN',
-			),
-		);
-
-		return $args + array(
-				'post_type' => Wordlift_Entity_Service::valid_entity_post_types(),
-				/*
+        if ( empty( $dataset_uri ) || 0 !== strpos( $uri, $dataset_uri ) ) {
+            $uri = null;
+        }
+
+        // Set the URI if it isn't set yet.
+        $post_status = get_post_status( $post_id );
+        if ( empty( $uri ) && 'auto-draft' !== $post_status && 'inherit' !== $post_status ) {
+            $uri = wl_build_entity_uri( $post_id );
+            wl_set_entity_uri( $post_id, $uri );
+        }
+
+        return $uri;
+    }
+
+    public function get_uri( $object_id, $type = Object_Type_Enum::POST ) {
+
+        if ( Object_Type_Enum::POST === $type ) {
+            return $this->get_uri_for_post( $object_id );
+        }
+
+        if ( Object_Type_Enum::USER === $type ) {
+            $uri = Wordlift_User_Service::get_instance()->get_uri( $object_id );
+
+            return ( false === $uri ? null : $uri );
+        }
+
+        if ( Object_Type_Enum::TERM === $type ) {
+            return wl_get_term_entity_uri( $object_id );
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the alternative label input HTML code.
+     *
+     * @param string $value The input value.
+     *
+     * @return string The input HTML code.
+     * @since 3.2.0
+     *
+     */
+    private function get_alternative_label_input( $value = '' ) {
+
+        return sprintf( self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr( $value ), __( 'Delete', 'wordlift' ) );
+    }
+
+    /**
+     * Get the number of entity posts published in this blog.
+     *
+     * @return int The number of published entity posts.
+     * @since 3.6.0
+     *
+     */
+    public function count() {
+        global $wpdb;
+
+        // Try to get the count from the transient.
+        $count = get_transient( '_wl_entity_service__count' );
+        if ( false !== $count ) {
+            return $count;
+        }
+
+        // Query the count.
+        $count = $wpdb->get_var( $wpdb->prepare(
+            "SELECT COUNT( DISTINCT( tr.object_id ) )"
+            . " FROM {$wpdb->term_relationships} tr"
+            . " INNER JOIN {$wpdb->term_taxonomy} tt"
+            . "  ON tt.taxonomy = %s AND tt.term_taxonomy_id = tr.term_taxonomy_id"
+            . " INNER JOIN {$wpdb->terms} t"
+            . "  ON t.term_id = tt.term_id AND t.name != %s",
+            Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+            'article'
+        ) );
+
+        // Store the count in cache.
+        set_transient( '_wl_entity_service__count', $count, 900 );
+
+        return $count;
+    }
+
+    /**
+     * Add the entity filtering criterias to the arguments for a `get_posts`
+     * call.
+     *
+     * @param array $args The arguments for a `get_posts` call.
+     *
+     * @return array The arguments for a `get_posts` call.
+     * @since 3.15.0
+     *
+     */
+    public static function add_criterias( $args ) {
+
+        // Build an optimal tax-query.
+        $tax_query = array(
+            'relation' => 'AND',
+            array(
+                'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                'operator' => 'EXISTS',
+            ),
+            array(
+                'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                'field'    => 'slug',
+                'terms'    => 'article',
+                'operator' => 'NOT IN',
+            ),
+        );
+
+        return $args + array(
+                'post_type' => Wordlift_Entity_Service::valid_entity_post_types(),
+                /*
 				 * Ensure compatibility with Polylang.
 				 *
 				 * @see https://github.com/insideout10/wordlift-plugin/issues/855.
@@ -553,102 +553,102 @@ 
 				 *
 				 * @since 3.19.5
 				 */
-				'lang'      => '',
-				'tax_query' => $tax_query,
-			);
-	}
-
-	/**
-	 * Create a new entity.
-	 *
-	 * @param string $name The entity name.
-	 * @param string $type_uri The entity's type URI.
-	 * @param null $logo The entity logo id (or NULL if none).
-	 * @param string $status The post status, by default 'publish'.
-	 *
-	 * @return int|WP_Error The entity post id or a {@link WP_Error} in case the `wp_insert_post` call fails.
-	 * @since 3.9.0
-	 *
-	 */
-	public function create( $name, $type_uri, $logo = null, $status = 'publish' ) {
-
-		// Create an entity for the publisher.
-		$post_id = @wp_insert_post( array(
-			'post_type'    => self::TYPE_NAME,
-			'post_title'   => $name,
-			'post_status'  => $status,
-			'post_content' => '',
-		) );
-
-		// Return the error if any.
-		if ( is_wp_error( $post_id ) ) {
-			return $post_id;
-		}
-
-		// Set the entity logo.
-		if ( $logo && is_numeric( $logo ) ) {
-			set_post_thumbnail( $post_id, $logo );
-		}
-
-		// Set the entity type.
-		Wordlift_Entity_Type_Service::get_instance()->set( $post_id, $type_uri );
-
-		return $post_id;
-	}
-
-	/**
-	 * Get the entities related to the one with the specified id. By default only
-	 * published entities will be returned.
-	 *
-	 * @param int $id The post id.
-	 * @param string $post_status The target post status (default = publish).
-	 *
-	 * @return array An array of post ids.
-	 * @since 3.10.0
-	 *
-	 */
-	public function get_related_entities( $id, $post_status = 'publish' ) {
-
-		return $this->relation_service->get_objects( $id, 'ids', null, $post_status );
-	}
-
-	/**
-	 * Get the list of entities.
-	 *
-	 * @param array $params Custom parameters for WordPress' own {@link get_posts} function.
-	 *
-	 * @return array An array of entity posts.
-	 * @since 3.12.2
-	 *
-	 */
-	public function get( $params = array() ) {
-
-		// Set the defaults.
-		$defaults = array( 'post_type' => 'entity' );
-
-		// Merge the defaults with the provided parameters.
-		$args = wp_parse_args( $params, $defaults );
-
-		// Call the `get_posts` function.
-		return get_posts( $args );
-	}
-
-	/**
-	 * The list of post type names which can be used for entities
-	 *
-	 * Criteria is that the post type is public. The list of valid post types
-	 * can be overridden with a filter.
-	 *
-	 * @return array Array containing the names of the valid post types.
-	 * @since 3.15.0
-	 *
-	 */
-	static function valid_entity_post_types() {
-
-		// Ignore builtins in the call to avoid getting attachments.
-		$post_types = array( 'post', 'page', self::TYPE_NAME, 'product' );
-
-		return apply_filters( 'wl_valid_entity_post_types', $post_types );
-	}
+                'lang'      => '',
+                'tax_query' => $tax_query,
+            );
+    }
+
+    /**
+     * Create a new entity.
+     *
+     * @param string $name The entity name.
+     * @param string $type_uri The entity's type URI.
+     * @param null $logo The entity logo id (or NULL if none).
+     * @param string $status The post status, by default 'publish'.
+     *
+     * @return int|WP_Error The entity post id or a {@link WP_Error} in case the `wp_insert_post` call fails.
+     * @since 3.9.0
+     *
+     */
+    public function create( $name, $type_uri, $logo = null, $status = 'publish' ) {
+
+        // Create an entity for the publisher.
+        $post_id = @wp_insert_post( array(
+            'post_type'    => self::TYPE_NAME,
+            'post_title'   => $name,
+            'post_status'  => $status,
+            'post_content' => '',
+        ) );
+
+        // Return the error if any.
+        if ( is_wp_error( $post_id ) ) {
+            return $post_id;
+        }
+
+        // Set the entity logo.
+        if ( $logo && is_numeric( $logo ) ) {
+            set_post_thumbnail( $post_id, $logo );
+        }
+
+        // Set the entity type.
+        Wordlift_Entity_Type_Service::get_instance()->set( $post_id, $type_uri );
+
+        return $post_id;
+    }
+
+    /**
+     * Get the entities related to the one with the specified id. By default only
+     * published entities will be returned.
+     *
+     * @param int $id The post id.
+     * @param string $post_status The target post status (default = publish).
+     *
+     * @return array An array of post ids.
+     * @since 3.10.0
+     *
+     */
+    public function get_related_entities( $id, $post_status = 'publish' ) {
+
+        return $this->relation_service->get_objects( $id, 'ids', null, $post_status );
+    }
+
+    /**
+     * Get the list of entities.
+     *
+     * @param array $params Custom parameters for WordPress' own {@link get_posts} function.
+     *
+     * @return array An array of entity posts.
+     * @since 3.12.2
+     *
+     */
+    public function get( $params = array() ) {
+
+        // Set the defaults.
+        $defaults = array( 'post_type' => 'entity' );
+
+        // Merge the defaults with the provided parameters.
+        $args = wp_parse_args( $params, $defaults );
+
+        // Call the `get_posts` function.
+        return get_posts( $args );
+    }
+
+    /**
+     * The list of post type names which can be used for entities
+     *
+     * Criteria is that the post type is public. The list of valid post types
+     * can be overridden with a filter.
+     *
+     * @return array Array containing the names of the valid post types.
+     * @since 3.15.0
+     *
+     */
+    static function valid_entity_post_types() {
+
+        // Ignore builtins in the call to avoid getting attachments.
+        $post_types = array( 'post', 'page', self::TYPE_NAME, 'product' );
+
+        return apply_filters( 'wl_valid_entity_post_types', $post_types );
+    }
 
 }

Spacing +95 added lines, -95 removed lines

@@ -99,9 +99,9 @@ 
 	 * @since 3.2.0
 	 *
 	 */
-	public function __construct( $ui_service, $relation_service, $entity_uri_service ) {
+	public function __construct($ui_service, $relation_service, $entity_uri_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Entity_Service');
 
 		$this->ui_service         = $ui_service;
 		$this->relation_service   = $relation_service;
@@ -132,17 +132,17 @@ 
 	 * @since 3.1.0
 	 *
 	 */
-	public function is_entity( $post_id ) {
+	public function is_entity($post_id) {
 
-		$terms = wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+		$terms = wp_get_object_terms($post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 
-		if ( is_wp_error( $terms ) ) {
-			$this->log->error( "Cannot get the terms for post $post_id: " . $terms->get_error_message() );
+		if (is_wp_error($terms)) {
+			$this->log->error("Cannot get the terms for post $post_id: ".$terms->get_error_message());
 
 			return false;
 		}
 
-		if ( empty( $terms ) ) {
+		if (empty($terms)) {
 			return false;
 		}
 
@@ -153,8 +153,8 @@ 
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
-		foreach ( $terms as $term ) {
-			if ( 1 !== preg_match( '~(^|-)article$~', $term->slug ) ) {
+		foreach ($terms as $term) {
+			if (1 !== preg_match('~(^|-)article$~', $term->slug)) {
 				return true;
 			}
 		}
@@ -174,19 +174,19 @@ 
 	 * @since 3.5.0
 	 *
 	 */
-	public function get_classification_scope_for( $post_id, $default = WL_WHAT_RELATION ) {
+	public function get_classification_scope_for($post_id, $default = WL_WHAT_RELATION) {
 
-		if ( false === $this->is_entity( $post_id ) ) {
+		if (false === $this->is_entity($post_id)) {
 			return $default;
 		}
 
 		// Retrieve the entity type
-		$entity_type_arr = Wordlift_Entity_Type_Service::get_instance()->get( $post_id );
-		$entity_type     = str_replace( 'wl-', '', $entity_type_arr['css_class'] );
+		$entity_type_arr = Wordlift_Entity_Type_Service::get_instance()->get($post_id);
+		$entity_type     = str_replace('wl-', '', $entity_type_arr['css_class']);
 		// Retrieve classification boxes configuration
-		$classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
-		foreach ( $classification_boxes as $cb ) {
-			if ( in_array( $entity_type, $cb['registeredTypes'] ) ) {
+		$classification_boxes = unserialize(WL_CORE_POST_CLASSIFICATION_BOXES);
+		foreach ($classification_boxes as $cb) {
+			if (in_array($entity_type, $cb['registeredTypes'])) {
 				return $cb['id'];
 			}
 		}
@@ -201,13 +201,13 @@ 
 	 *
 	 * @return bool|null Null if it's not an entity, otherwise true if it's used.
 	 */
-	public function is_used( $post_id ) {
+	public function is_used($post_id) {
 
-		if ( false === $this->is_entity( $post_id ) ) {
+		if (false === $this->is_entity($post_id)) {
 			return null;
 		}
 		// Retrieve the post
-		$entity = get_post( $post_id );
+		$entity = get_post($post_id);
 
 		global $wpdb;
 		// Retrieve Wordlift relation instances table name
@@ -220,9 +220,9 @@ 
 		);
 
 		// Perform the query
-		$relation_instances = (int) $wpdb->get_var( $stmt );
+		$relation_instances = (int) $wpdb->get_var($stmt);
 		// If there is at least one relation instance for the current entity, then it's used
-		if ( 0 < $relation_instances ) {
+		if (0 < $relation_instances) {
 			return true;
 		}
 
@@ -230,13 +230,13 @@ 
 		$stmt = $wpdb->prepare(
 			"SELECT COUNT(*) FROM $wpdb->postmeta WHERE post_id != %d AND meta_value = %s",
 			$entity->ID,
-			wl_get_entity_uri( $entity->ID )
+			wl_get_entity_uri($entity->ID)
 		);
 		// Perform the query
-		$meta_instances = (int) $wpdb->get_var( $stmt );
+		$meta_instances = (int) $wpdb->get_var($stmt);
 
 		// If there is at least one meta that refers the current entity uri, then current entity is used
-		if ( 0 < $meta_instances ) {
+		if (0 < $meta_instances) {
 			return true;
 		}
 
@@ -256,9 +256,9 @@ 
 	 * @since      3.2.0
 	 *
 	 */
-	public function get_entity_post_by_uri( $uri ) {
+	public function get_entity_post_by_uri($uri) {
 
-		return $this->entity_uri_service->get_entity( $uri );
+		return $this->entity_uri_service->get_entity($uri);
 	}
 
 	/**
@@ -273,10 +273,10 @@ 
 	 * @param WP_Post $post Post object.
 	 * @param bool $update Whether this is an existing post being updated or not.
 	 */
-	public function save_post( $post_id, $post, $update ) {
+	public function save_post($post_id, $post, $update) {
 
 		// Avoid doing anything if post is autosave or a revision.
-		if ( wp_is_post_autosave( $post ) || wp_is_post_revision( $post ) ) {
+		if (wp_is_post_autosave($post) || wp_is_post_revision($post)) {
 			return;
 		}
 
@@ -286,16 +286,16 @@ 
 		// the $post_id in the save_post call matches the post id set in the request.
 		//
 		// If this is not the current post being saved or if it's not an entity, return.
-		if ( ! isset( $_REQUEST['post_ID'] ) || $_REQUEST['post_ID'] != $post_id || ! $this->is_entity( $post_id ) ) {
+		if ( ! isset($_REQUEST['post_ID']) || $_REQUEST['post_ID'] != $post_id || ! $this->is_entity($post_id)) {
 			return;
 		}
 
 		// Get the alt labels from the request (or empty array).
-		$alt_labels = isset( $_REQUEST['wl_alternative_label'] ) ? (array) $_REQUEST['wl_alternative_label'] : array();
+		$alt_labels = isset($_REQUEST['wl_alternative_label']) ? (array) $_REQUEST['wl_alternative_label'] : array();
 
-		if ( ( ! empty( $_POST['content'] ) && ! empty( $_POST['post_content'] ) ) || isset( $_REQUEST['wl_alternative_label'] ) ) {
+		if (( ! empty($_POST['content']) && ! empty($_POST['post_content'])) || isset($_REQUEST['wl_alternative_label'])) {
 			// This is via classic editor, so set the alternative labels.
-			$this->set_alternative_labels( $post_id, $alt_labels );
+			$this->set_alternative_labels($post_id, $alt_labels);
 		}
 
 
@@ -310,28 +310,28 @@ 
 	 * @since 3.2.0
 	 *
 	 */
-	public function set_alternative_labels( $post_id, $alt_labels ) {
+	public function set_alternative_labels($post_id, $alt_labels) {
 
 		// Bail out if post id is not numeric. We add this check as we found a WP install that was sending a WP_Error
 		// instead of post id.
-		if ( ! is_numeric( $post_id ) ) {
+		if ( ! is_numeric($post_id)) {
 			return;
 		}
 
 		// Force $alt_labels to be an array
-		if ( ! is_array( $alt_labels ) ) {
-			$alt_labels = array( $alt_labels );
+		if ( ! is_array($alt_labels)) {
+			$alt_labels = array($alt_labels);
 		}
 
-		$this->log->debug( "Setting alternative labels [ post id :: $post_id ][ alt labels :: " . implode( ',', $alt_labels ) . " ]" );
+		$this->log->debug("Setting alternative labels [ post id :: $post_id ][ alt labels :: ".implode(',', $alt_labels)." ]");
 
 		// Delete all the existing alternate labels.
-		delete_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
+		delete_post_meta($post_id, self::ALTERNATIVE_LABEL_META_KEY);
 
 		// Set the alternative labels.
-		foreach ( $alt_labels as $alt_label ) {
-			if ( ! empty( $alt_label ) ) {
-				add_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY, (string) $alt_label );
+		foreach ($alt_labels as $alt_label) {
+			if ( ! empty($alt_label)) {
+				add_post_meta($post_id, self::ALTERNATIVE_LABEL_META_KEY, (string) $alt_label);
 			}
 		}
 
@@ -346,9 +346,9 @@ 
 	 * @since 3.2.0
 	 *
 	 */
-	public function get_alternative_labels( $post_id ) {
+	public function get_alternative_labels($post_id) {
 
-		return get_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
+		return get_post_meta($post_id, self::ALTERNATIVE_LABEL_META_KEY);
 	}
 
 	/**
@@ -360,9 +360,9 @@ 
 	 * @return array An array with the entity title and labels.
 	 * @since 3.12.0
 	 */
-	public function get_labels( $post_id, $object_type = Object_Type_Enum::POST ) {
-		if ( $object_type === Object_Type_Enum::POST ) {
-			return array_merge( (array) get_the_title( $post_id ), $this->get_alternative_labels( $post_id ) );
+	public function get_labels($post_id, $object_type = Object_Type_Enum::POST) {
+		if ($object_type === Object_Type_Enum::POST) {
+			return array_merge((array) get_the_title($post_id), $this->get_alternative_labels($post_id));
 		}
 		// Term Reference dont have synonyms yet.
 		return array();
@@ -376,30 +376,30 @@ 
 	 * @since 3.2.0
 	 *
 	 */
-	public function edit_form_before_permalink( $post ) {
+	public function edit_form_before_permalink($post) {
 
 		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post->ID ) ) {
+		if ( ! $this->is_entity($post->ID)) {
 			return;
 		}
 
 		// If disabled by filter, return.
-		if ( ! apply_filters( 'wl_feature__enable__add-synonyms', true ) ) {
+		if ( ! apply_filters('wl_feature__enable__add-synonyms', true)) {
 			return;
 		}
 
 		// Print the input template.
-		$this->ui_service->print_template( 'wl-tmpl-alternative-label-input', $this->get_alternative_label_input() );
+		$this->ui_service->print_template('wl-tmpl-alternative-label-input', $this->get_alternative_label_input());
 
 		// Print all the currently set alternative labels.
-		foreach ( $this->get_alternative_labels( $post->ID ) as $alt_label ) {
+		foreach ($this->get_alternative_labels($post->ID) as $alt_label) {
 
-			echo $this->get_alternative_label_input( $alt_label );
+			echo $this->get_alternative_label_input($alt_label);
 
 		};
 
 		// Print the button.
-		$this->ui_service->print_button( 'wl-add-alternative-labels-button', __( 'Add more titles', 'wordlift' ) );
+		$this->ui_service->print_button('wl-add-alternative-labels-button', __('Add more titles', 'wordlift'));
 
 	}
 
@@ -412,57 +412,57 @@ 
 	 * @since 3.6.0
 	 *
 	 */
-	private function get_uri_for_post( $post_id ) {
+	private function get_uri_for_post($post_id) {
 
-		$log = Wordlift_Log_Service::get_logger( get_class() );
+		$log = Wordlift_Log_Service::get_logger(get_class());
 
 		// If a null is given, nothing to do
-		if ( is_null( $post_id ) ) {
+		if (is_null($post_id)) {
 			return null;
 		}
 
 		$dataset_uri = wl_configuration_get_redlink_dataset_uri();
 
-		if ( empty( $dataset_uri ) ) {
+		if (empty($dataset_uri)) {
 			// Continue even if the dataset uri is not properly configured. It is handled in function wl_build_entity_uri()
-			$log->debug( 'Continuing, dataset uri not configured...' );
+			$log->debug('Continuing, dataset uri not configured...');
 		}
 
-		$uri = get_post_meta( $post_id, WL_ENTITY_URL_META_NAME, true );
+		$uri = get_post_meta($post_id, WL_ENTITY_URL_META_NAME, true);
 
 		/*
 		 * Consider the URI invalid if it doesn't start with the dataset URI.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/996
 		 */
-		if ( empty( $dataset_uri ) || 0 !== strpos( $uri, $dataset_uri ) ) {
+		if (empty($dataset_uri) || 0 !== strpos($uri, $dataset_uri)) {
 			$uri = null;
 		}
 
 		// Set the URI if it isn't set yet.
-		$post_status = get_post_status( $post_id );
-		if ( empty( $uri ) && 'auto-draft' !== $post_status && 'inherit' !== $post_status ) {
-			$uri = wl_build_entity_uri( $post_id );
-			wl_set_entity_uri( $post_id, $uri );
+		$post_status = get_post_status($post_id);
+		if (empty($uri) && 'auto-draft' !== $post_status && 'inherit' !== $post_status) {
+			$uri = wl_build_entity_uri($post_id);
+			wl_set_entity_uri($post_id, $uri);
 		}
 
 		return $uri;
 	}
 
-	public function get_uri( $object_id, $type = Object_Type_Enum::POST ) {
+	public function get_uri($object_id, $type = Object_Type_Enum::POST) {
 
-		if ( Object_Type_Enum::POST === $type ) {
-			return $this->get_uri_for_post( $object_id );
+		if (Object_Type_Enum::POST === $type) {
+			return $this->get_uri_for_post($object_id);
 		}
 
-		if ( Object_Type_Enum::USER === $type ) {
-			$uri = Wordlift_User_Service::get_instance()->get_uri( $object_id );
+		if (Object_Type_Enum::USER === $type) {
+			$uri = Wordlift_User_Service::get_instance()->get_uri($object_id);
 
-			return ( false === $uri ? null : $uri );
+			return (false === $uri ? null : $uri);
 		}
 
-		if ( Object_Type_Enum::TERM === $type ) {
-			return wl_get_term_entity_uri( $object_id );
+		if (Object_Type_Enum::TERM === $type) {
+			return wl_get_term_entity_uri($object_id);
 		}
 
 		return null;
@@ -477,9 +477,9 @@ 
 	 * @since 3.2.0
 	 *
 	 */
-	private function get_alternative_label_input( $value = '' ) {
+	private function get_alternative_label_input($value = '') {
 
-		return sprintf( self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr( $value ), __( 'Delete', 'wordlift' ) );
+		return sprintf(self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr($value), __('Delete', 'wordlift'));
 	}
 
 	/**
@@ -493,13 +493,13 @@ 
 		global $wpdb;
 
 		// Try to get the count from the transient.
-		$count = get_transient( '_wl_entity_service__count' );
-		if ( false !== $count ) {
+		$count = get_transient('_wl_entity_service__count');
+		if (false !== $count) {
 			return $count;
 		}
 
 		// Query the count.
-		$count = $wpdb->get_var( $wpdb->prepare(
+		$count = $wpdb->get_var($wpdb->prepare(
 			"SELECT COUNT( DISTINCT( tr.object_id ) )"
 			. " FROM {$wpdb->term_relationships} tr"
 			. " INNER JOIN {$wpdb->term_taxonomy} tt"
@@ -508,10 +508,10 @@ 
 			. "  ON t.term_id = tt.term_id AND t.name != %s",
 			Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
 			'article'
-		) );
+		));
 
 		// Store the count in cache.
-		set_transient( '_wl_entity_service__count', $count, 900 );
+		set_transient('_wl_entity_service__count', $count, 900);
 
 		return $count;
 	}
@@ -526,7 +526,7 @@ 
 	 * @since 3.15.0
 	 *
 	 */
-	public static function add_criterias( $args ) {
+	public static function add_criterias($args) {
 
 		// Build an optimal tax-query.
 		$tax_query = array(
@@ -570,28 +570,28 @@ 
 	 * @since 3.9.0
 	 *
 	 */
-	public function create( $name, $type_uri, $logo = null, $status = 'publish' ) {
+	public function create($name, $type_uri, $logo = null, $status = 'publish') {
 
 		// Create an entity for the publisher.
-		$post_id = @wp_insert_post( array(
+		$post_id = @wp_insert_post(array(
 			'post_type'    => self::TYPE_NAME,
 			'post_title'   => $name,
 			'post_status'  => $status,
 			'post_content' => '',
-		) );
+		));
 
 		// Return the error if any.
-		if ( is_wp_error( $post_id ) ) {
+		if (is_wp_error($post_id)) {
 			return $post_id;
 		}
 
 		// Set the entity logo.
-		if ( $logo && is_numeric( $logo ) ) {
-			set_post_thumbnail( $post_id, $logo );
+		if ($logo && is_numeric($logo)) {
+			set_post_thumbnail($post_id, $logo);
 		}
 
 		// Set the entity type.
-		Wordlift_Entity_Type_Service::get_instance()->set( $post_id, $type_uri );
+		Wordlift_Entity_Type_Service::get_instance()->set($post_id, $type_uri);
 
 		return $post_id;
 	}
@@ -607,9 +607,9 @@ 
 	 * @since 3.10.0
 	 *
 	 */
-	public function get_related_entities( $id, $post_status = 'publish' ) {
+	public function get_related_entities($id, $post_status = 'publish') {
 
-		return $this->relation_service->get_objects( $id, 'ids', null, $post_status );
+		return $this->relation_service->get_objects($id, 'ids', null, $post_status);
 	}
 
 	/**
@@ -621,16 +621,16 @@ 
 	 * @since 3.12.2
 	 *
 	 */
-	public function get( $params = array() ) {
+	public function get($params = array()) {
 
 		// Set the defaults.
-		$defaults = array( 'post_type' => 'entity' );
+		$defaults = array('post_type' => 'entity');
 
 		// Merge the defaults with the provided parameters.
-		$args = wp_parse_args( $params, $defaults );
+		$args = wp_parse_args($params, $defaults);
 
 		// Call the `get_posts` function.
-		return get_posts( $args );
+		return get_posts($args);
 	}
 
 	/**
@@ -646,9 +646,9 @@ 
 	static function valid_entity_post_types() {
 
 		// Ignore builtins in the call to avoid getting attachments.
-		$post_types = array( 'post', 'page', self::TYPE_NAME, 'product' );
+		$post_types = array('post', 'page', self::TYPE_NAME, 'product');
 
-		return apply_filters( 'wl_valid_entity_post_types', $post_types );
+		return apply_filters('wl_valid_entity_post_types', $post_types);
 	}
 
 }

src/shortcodes/wordlift_shortcode_chord.php

Indentation +137 added lines, -137 removed lines

@@ -15,45 +15,45 @@ 
  * @return mixed
  */
 function wl_shortcode_chord_most_referenced_entity_id() {
-	// Get the last 20 articles by post date.
-	// For each article get the entities they reference.
-	$post_ids = get_posts( array(
-		'numberposts' => 20,
-		'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
-		'fields'      => 'ids', // Only get post IDs.
-		'post_status' => 'publish',
-		'tax_query'   => array(
-			'relation' => 'OR',
-			array(
-				'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-				'operator' => 'NOT EXISTS',
-			),
-			array(
-				'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-				'field'    => 'slug',
-				'terms'    => 'article',
-			),
-		),
-		'orderby'     => 'post_date',
-		'order'       => 'DESC',
-	) );
-
-	if ( empty( $post_ids ) ) {
-		return null;
-	}
-
-	$entities = array();
-	foreach ( $post_ids as $id ) {
-		$entities = array_merge( $entities, wl_core_get_related_entity_ids( $id ) );
-	}
-
-	$famous_entities = array_count_values( $entities );
-	arsort( $famous_entities );
-	if ( sizeof( $famous_entities ) >= 1 ) {
-		return key( $famous_entities );
-	} else {
-		return $post_ids[0];
-	}
+    // Get the last 20 articles by post date.
+    // For each article get the entities they reference.
+    $post_ids = get_posts( array(
+        'numberposts' => 20,
+        'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
+        'fields'      => 'ids', // Only get post IDs.
+        'post_status' => 'publish',
+        'tax_query'   => array(
+            'relation' => 'OR',
+            array(
+                'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                'operator' => 'NOT EXISTS',
+            ),
+            array(
+                'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                'field'    => 'slug',
+                'terms'    => 'article',
+            ),
+        ),
+        'orderby'     => 'post_date',
+        'order'       => 'DESC',
+    ) );
+
+    if ( empty( $post_ids ) ) {
+        return null;
+    }
+
+    $entities = array();
+    foreach ( $post_ids as $id ) {
+        $entities = array_merge( $entities, wl_core_get_related_entity_ids( $id ) );
+    }
+
+    $famous_entities = array_count_values( $entities );
+    arsort( $famous_entities );
+    if ( sizeof( $famous_entities ) >= 1 ) {
+        return key( $famous_entities );
+    } else {
+        return $post_ids[0];
+    }
 
 }
 
@@ -71,60 +71,60 @@ 
  */
 function wl_shortcode_chord_get_relations( $entity_id, $depth = 2, $related = null, $max_size = 9 ) {
 
-	if ( ! is_null( $related ) ) {
-		if ( 0 === $depth ) {
-			return $related;
-		}
-	}
+    if ( ! is_null( $related ) ) {
+        if ( 0 === $depth ) {
+            return $related;
+        }
+    }
 
-	wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( is_null( $related ) ? 'yes' : 'no' ) . " ]" );
+    wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( is_null( $related ) ? 'yes' : 'no' ) . " ]" );
 
-	// Create a related array which will hold entities and relations.
-	if ( is_null( $related ) ) {
-		$related = array(
-			'entities'  => array( $entity_id ),
-			'relations' => array(),
-		);
-	}
+    // Create a related array which will hold entities and relations.
+    if ( is_null( $related ) ) {
+        $related = array(
+            'entities'  => array( $entity_id ),
+            'relations' => array(),
+        );
+    }
 
-	// Get related entities
-	$related_entity_ids = wl_core_get_related_entity_ids( $entity_id, array(
-		'status' => 'publish',
-	) );
+    // Get related entities
+    $related_entity_ids = wl_core_get_related_entity_ids( $entity_id, array(
+        'status' => 'publish',
+    ) );
 
-	// If the current node is an entity, add related posts too
-	$related_post_ids = ( Wordlift_Entity_Service::get_instance()
-	                                             ->is_entity( $entity_id ) ) ?
-		wl_core_get_related_post_ids( $entity_id, array(
-			'status' => 'publish',
-		) ) :
-		array();
+    // If the current node is an entity, add related posts too
+    $related_post_ids = ( Wordlift_Entity_Service::get_instance()
+                                                    ->is_entity( $entity_id ) ) ?
+        wl_core_get_related_post_ids( $entity_id, array(
+            'status' => 'publish',
+        ) ) :
+        array();
 
-	// Merge results and remove duplicated entries
-	$related_ids = array_unique( array_merge( $related_post_ids, $related_entity_ids ) );
+    // Merge results and remove duplicated entries
+    $related_ids = array_unique( array_merge( $related_post_ids, $related_entity_ids ) );
 
-	// TODO: List of entities ($rel) should be ordered by interest factors.
-	shuffle( $related_ids );
+    // TODO: List of entities ($rel) should be ordered by interest factors.
+    shuffle( $related_ids );
 
-	// Now we have all the related IDs.
-	foreach ( $related_ids as $related_id ) {
+    // Now we have all the related IDs.
+    foreach ( $related_ids as $related_id ) {
 
-		if ( count( $related['entities'] ) >= $max_size ) {
-			return $related;
-		}
+        if ( count( $related['entities'] ) >= $max_size ) {
+            return $related;
+        }
 
-		$related['relations'][] = array( $entity_id, $related_id );
+        $related['relations'][] = array( $entity_id, $related_id );
 
-		if ( ! in_array( $related_id, $related['entities'] ) ) {
-			// Found new related entity!
-			$related['entities'][] = $related_id;
+        if ( ! in_array( $related_id, $related['entities'] ) ) {
+            // Found new related entity!
+            $related['entities'][] = $related_id;
 
-			$related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
-		}
-	}
+            $related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
+        }
+    }
 
-	// End condition 2: no more entities to search for.
-	return $related;
+    // End condition 2: no more entities to search for.
+    return $related;
 }
 
 /**
@@ -138,57 +138,57 @@ 
  */
 function wl_shortcode_chord_get_graph( $data ) {
 
-	// Refactor the entities array in order to provide entities relevant data (uri, url, label, type, css_class).
-	array_walk( $data['entities'], function ( &$item ) {
-		$post = get_post( $item );
-
-		// Skip non-existing posts.
-		if ( is_null( $post ) ) {
-			wl_write_log( "wl_shortcode_chord_get_graph : post not found [ post id :: $item ]" );
-
-			return $item;
-		}
-
-		// Get the entity taxonomy bound to this post (if there's no taxonomy, no stylesheet will be set).
-		$term = Wordlift_Entity_Type_Service::get_instance()->get( $item );
-
-		// The following log may create a circular loop.
-		// wl_write_log( "wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: " . var_export( $term, true ) . " ]" );
-
-		// TODO: get all images
-		$thumbnail    = null;
-		$thumbnail_id = get_post_thumbnail_id( $post->ID );
-		if ( '' !== $thumbnail_id && 0 !== $thumbnail_id ) {
-			$attachment = wp_get_attachment_image_src( $thumbnail_id );
-			if ( false !== $attachment ) {
-				$thumbnail = esc_attr( $attachment[0] );
-			}
-		}
-
-		$entity = array(
-			'uri'        => wl_get_entity_uri( $item ),
-			'url'        => get_permalink( $item ),
-			'label'      => $post->post_title,
-			'type'       => $post->post_type,
-			'thumbnails' => array( $thumbnail ),
-			'css_class'  => ( isset( $term['css_class'] ) ? $term['css_class'] : '' ),
-		);
-
-		$item = $entity;
-	} );
-
-	// Refactor the relations.
-	array_walk( $data['relations'], function ( &$item ) {
-		$relation = array(
-			's' => wl_get_entity_uri( $item[0] ),
-			'o' => wl_get_entity_uri( $item[1] ),
-		);
-
-		$item = $relation;
-	} );
-
-	// Return the JSON representation.
-	return $data;
+    // Refactor the entities array in order to provide entities relevant data (uri, url, label, type, css_class).
+    array_walk( $data['entities'], function ( &$item ) {
+        $post = get_post( $item );
+
+        // Skip non-existing posts.
+        if ( is_null( $post ) ) {
+            wl_write_log( "wl_shortcode_chord_get_graph : post not found [ post id :: $item ]" );
+
+            return $item;
+        }
+
+        // Get the entity taxonomy bound to this post (if there's no taxonomy, no stylesheet will be set).
+        $term = Wordlift_Entity_Type_Service::get_instance()->get( $item );
+
+        // The following log may create a circular loop.
+        // wl_write_log( "wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: " . var_export( $term, true ) . " ]" );
+
+        // TODO: get all images
+        $thumbnail    = null;
+        $thumbnail_id = get_post_thumbnail_id( $post->ID );
+        if ( '' !== $thumbnail_id && 0 !== $thumbnail_id ) {
+            $attachment = wp_get_attachment_image_src( $thumbnail_id );
+            if ( false !== $attachment ) {
+                $thumbnail = esc_attr( $attachment[0] );
+            }
+        }
+
+        $entity = array(
+            'uri'        => wl_get_entity_uri( $item ),
+            'url'        => get_permalink( $item ),
+            'label'      => $post->post_title,
+            'type'       => $post->post_type,
+            'thumbnails' => array( $thumbnail ),
+            'css_class'  => ( isset( $term['css_class'] ) ? $term['css_class'] : '' ),
+        );
+
+        $item = $entity;
+    } );
+
+    // Refactor the relations.
+    array_walk( $data['relations'], function ( &$item ) {
+        $relation = array(
+            's' => wl_get_entity_uri( $item[0] ),
+            'o' => wl_get_entity_uri( $item[1] ),
+        );
+
+        $item = $relation;
+    } );
+
+    // Return the JSON representation.
+    return $data;
 }
 
 /**
@@ -199,13 +199,13 @@ 
  */
 function wl_shortcode_chord_ajax() {
 
-	$post_id =  isset( $_REQUEST['post_id']) ? (int) $_REQUEST['post_id'] : 0 ;
-	$depth   =  isset( $_REQUEST['depth']) ? (int) $_REQUEST['depth'] : 2;
+    $post_id =  isset( $_REQUEST['post_id']) ? (int) $_REQUEST['post_id'] : 0 ;
+    $depth   =  isset( $_REQUEST['depth']) ? (int) $_REQUEST['depth'] : 2;
 
-	$relations = wl_shortcode_chord_get_relations( $post_id, $depth );
-	$graph     = wl_shortcode_chord_get_graph( $relations );
+    $relations = wl_shortcode_chord_get_relations( $post_id, $depth );
+    $graph     = wl_shortcode_chord_get_graph( $relations );
 
-	wl_core_send_json( $graph );
+    wl_core_send_json( $graph );
 }
 
 add_action( 'wp_ajax_wl_chord', 'wl_shortcode_chord_ajax' );

Spacing +53 added lines, -54 removed lines

@@ -17,7 +17,7 @@ 
 function wl_shortcode_chord_most_referenced_entity_id() {
 	// Get the last 20 articles by post date.
 	// For each article get the entities they reference.
-	$post_ids = get_posts( array(
+	$post_ids = get_posts(array(
 		'numberposts' => 20,
 		'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
 		'fields'      => 'ids', // Only get post IDs.
@@ -36,21 +36,21 @@ 
 		),
 		'orderby'     => 'post_date',
 		'order'       => 'DESC',
-	) );
+	));
 
-	if ( empty( $post_ids ) ) {
+	if (empty($post_ids)) {
 		return null;
 	}
 
 	$entities = array();
-	foreach ( $post_ids as $id ) {
-		$entities = array_merge( $entities, wl_core_get_related_entity_ids( $id ) );
+	foreach ($post_ids as $id) {
+		$entities = array_merge($entities, wl_core_get_related_entity_ids($id));
 	}
 
-	$famous_entities = array_count_values( $entities );
-	arsort( $famous_entities );
-	if ( sizeof( $famous_entities ) >= 1 ) {
-		return key( $famous_entities );
+	$famous_entities = array_count_values($entities);
+	arsort($famous_entities);
+	if (sizeof($famous_entities) >= 1) {
+		return key($famous_entities);
 	} else {
 		return $post_ids[0];
 	}
@@ -69,57 +69,56 @@ 
  * @uses wl_core_get_related_post_ids() to get the list of post ids that reference an entity.
  *
  */
-function wl_shortcode_chord_get_relations( $entity_id, $depth = 2, $related = null, $max_size = 9 ) {
+function wl_shortcode_chord_get_relations($entity_id, $depth = 2, $related = null, $max_size = 9) {
 
-	if ( ! is_null( $related ) ) {
-		if ( 0 === $depth ) {
+	if ( ! is_null($related)) {
+		if (0 === $depth) {
 			return $related;
 		}
 	}
 
-	wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( is_null( $related ) ? 'yes' : 'no' ) . " ]" );
+	wl_write_log("wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: ".(is_null($related) ? 'yes' : 'no')." ]");
 
 	// Create a related array which will hold entities and relations.
-	if ( is_null( $related ) ) {
+	if (is_null($related)) {
 		$related = array(
-			'entities'  => array( $entity_id ),
+			'entities'  => array($entity_id),
 			'relations' => array(),
 		);
 	}
 
 	// Get related entities
-	$related_entity_ids = wl_core_get_related_entity_ids( $entity_id, array(
+	$related_entity_ids = wl_core_get_related_entity_ids($entity_id, array(
 		'status' => 'publish',
-	) );
+	));
 
 	// If the current node is an entity, add related posts too
-	$related_post_ids = ( Wordlift_Entity_Service::get_instance()
-	                                             ->is_entity( $entity_id ) ) ?
-		wl_core_get_related_post_ids( $entity_id, array(
+	$related_post_ids = (Wordlift_Entity_Service::get_instance()
+	                                             ->is_entity($entity_id)) ?
+		wl_core_get_related_post_ids($entity_id, array(
 			'status' => 'publish',
-		) ) :
-		array();
+		)) : array();
 
 	// Merge results and remove duplicated entries
-	$related_ids = array_unique( array_merge( $related_post_ids, $related_entity_ids ) );
+	$related_ids = array_unique(array_merge($related_post_ids, $related_entity_ids));
 
 	// TODO: List of entities ($rel) should be ordered by interest factors.
-	shuffle( $related_ids );
+	shuffle($related_ids);
 
 	// Now we have all the related IDs.
-	foreach ( $related_ids as $related_id ) {
+	foreach ($related_ids as $related_id) {
 
-		if ( count( $related['entities'] ) >= $max_size ) {
+		if (count($related['entities']) >= $max_size) {
 			return $related;
 		}
 
-		$related['relations'][] = array( $entity_id, $related_id );
+		$related['relations'][] = array($entity_id, $related_id);
 
-		if ( ! in_array( $related_id, $related['entities'] ) ) {
+		if ( ! in_array($related_id, $related['entities'])) {
 			// Found new related entity!
 			$related['entities'][] = $related_id;
 
-			$related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
+			$related = wl_shortcode_chord_get_relations($related_id, ($depth - 1), $related, $max_size);
 		}
 	}
 
@@ -136,52 +135,52 @@ 
  *
  * @return mixed|string
  */
-function wl_shortcode_chord_get_graph( $data ) {
+function wl_shortcode_chord_get_graph($data) {
 
 	// Refactor the entities array in order to provide entities relevant data (uri, url, label, type, css_class).
-	array_walk( $data['entities'], function ( &$item ) {
-		$post = get_post( $item );
+	array_walk($data['entities'], function(&$item) {
+		$post = get_post($item);
 
 		// Skip non-existing posts.
-		if ( is_null( $post ) ) {
-			wl_write_log( "wl_shortcode_chord_get_graph : post not found [ post id :: $item ]" );
+		if (is_null($post)) {
+			wl_write_log("wl_shortcode_chord_get_graph : post not found [ post id :: $item ]");
 
 			return $item;
 		}
 
 		// Get the entity taxonomy bound to this post (if there's no taxonomy, no stylesheet will be set).
-		$term = Wordlift_Entity_Type_Service::get_instance()->get( $item );
+		$term = Wordlift_Entity_Type_Service::get_instance()->get($item);
 
 		// The following log may create a circular loop.
 		// wl_write_log( "wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: " . var_export( $term, true ) . " ]" );
 
 		// TODO: get all images
 		$thumbnail    = null;
-		$thumbnail_id = get_post_thumbnail_id( $post->ID );
-		if ( '' !== $thumbnail_id && 0 !== $thumbnail_id ) {
-			$attachment = wp_get_attachment_image_src( $thumbnail_id );
-			if ( false !== $attachment ) {
-				$thumbnail = esc_attr( $attachment[0] );
+		$thumbnail_id = get_post_thumbnail_id($post->ID);
+		if ('' !== $thumbnail_id && 0 !== $thumbnail_id) {
+			$attachment = wp_get_attachment_image_src($thumbnail_id);
+			if (false !== $attachment) {
+				$thumbnail = esc_attr($attachment[0]);
 			}
 		}
 
 		$entity = array(
-			'uri'        => wl_get_entity_uri( $item ),
-			'url'        => get_permalink( $item ),
+			'uri'        => wl_get_entity_uri($item),
+			'url'        => get_permalink($item),
 			'label'      => $post->post_title,
 			'type'       => $post->post_type,
-			'thumbnails' => array( $thumbnail ),
-			'css_class'  => ( isset( $term['css_class'] ) ? $term['css_class'] : '' ),
+			'thumbnails' => array($thumbnail),
+			'css_class'  => (isset($term['css_class']) ? $term['css_class'] : ''),
 		);
 
 		$item = $entity;
 	} );
 
 	// Refactor the relations.
-	array_walk( $data['relations'], function ( &$item ) {
+	array_walk($data['relations'], function(&$item) {
 		$relation = array(
-			's' => wl_get_entity_uri( $item[0] ),
-			'o' => wl_get_entity_uri( $item[1] ),
+			's' => wl_get_entity_uri($item[0]),
+			'o' => wl_get_entity_uri($item[1]),
 		);
 
 		$item = $relation;
@@ -199,14 +198,14 @@ 
  */
 function wl_shortcode_chord_ajax() {
 
-	$post_id =  isset( $_REQUEST['post_id']) ? (int) $_REQUEST['post_id'] : 0 ;
-	$depth   =  isset( $_REQUEST['depth']) ? (int) $_REQUEST['depth'] : 2;
+	$post_id = isset($_REQUEST['post_id']) ? (int) $_REQUEST['post_id'] : 0;
+	$depth   = isset($_REQUEST['depth']) ? (int) $_REQUEST['depth'] : 2;
 
-	$relations = wl_shortcode_chord_get_relations( $post_id, $depth );
-	$graph     = wl_shortcode_chord_get_graph( $relations );
+	$relations = wl_shortcode_chord_get_relations($post_id, $depth);
+	$graph     = wl_shortcode_chord_get_graph($relations);
 
-	wl_core_send_json( $graph );
+	wl_core_send_json($graph);
 }
 
-add_action( 'wp_ajax_wl_chord', 'wl_shortcode_chord_ajax' );
-add_action( 'wp_ajax_nopriv_wl_chord', 'wl_shortcode_chord_ajax' );
+add_action('wp_ajax_wl_chord', 'wl_shortcode_chord_ajax');
+add_action('wp_ajax_nopriv_wl_chord', 'wl_shortcode_chord_ajax');

src/includes/rebuild/class-wordlift-reference-rebuild-service.php

Indentation +100 added lines, -100 removed lines

@@ -2,110 +2,110 @@
 
 class Wordlift_Reference_Rebuild_Service extends Wordlift_Rebuild_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;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-
-	/**
-	 * Wordlift_Reference_Rebuild_Service constructor.
-	 *
-	 * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 */
-	public function __construct( $entity_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Reference_Rebuild_Service' );
-
-		$this->entity_service = $entity_service;
-	}
-
-	public function rebuild() {
-		set_time_limit( 21600 ); // 6 hours
-
-		// Send textual output.
-		header( 'Content-type: text/plain; charset=utf-8' );
-
-		// We start at 0 by default and get to max.
-		$offset = isset( $_GET['offset'] ) ? (int) $_GET['offset'] : 0;
-		$limit  = isset( $_GET['limit'] ) ? (int) $_GET['limit'] : 1;
-		$max    = $offset + $limit;
-
-		$this->log->debug( 'Processing references...' );
-
-		// Go through the list of published entities and posts and call the (legacy)
-		// `wl_linked_data_save_post` function for each one. We're using the `process`
-		// function which is provided by the parent `Wordlift_Listable` abstract class
-		// and will cycle through all the posts w/ a very small memory footprint
-		// in order to avoid memory errors.
-
-		$count          = 0;
-		$log            = $this->log;
-		$entity_service = $this->entity_service;
-
-		$this->process(
-			function ( $post_id ) use ( &$count, $log, $entity_service ) {
-				$count ++;
-
-				if ( $entity_service->is_entity( $post_id ) ) {
-					$log->trace( "Post $post_id is an entity, skipping..." );
-
-					return;
-				}
-
-				$log->trace( "Going to save post $count, ID $post_id..." );
-				do_action( 'wl_legacy_linked_data__push', $post_id );
-			},
-			array(),
-			$offset,
-			$max
-		);
-
-		// Redirect to the next chunk.
-		if ( $count == $limit ) {
-			$log->trace( 'Redirecting to post #' . ( $offset + 1 ) . '...' );
-			$url = admin_url( 'admin-ajax.php?action=wl_rebuild_references&offset=' . ( $offset + $limit ) . '&limit=' . $limit );
-			$this->redirect( $url );
-		}
-
-		$this->log->info( "Rebuild complete" );
-		echo( "Rebuild complete" );
-
-		// If we're being called as AJAX, die here.
-		if ( DOING_AJAX ) {
-			wp_die();
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function find( $offset = 0, $limit = 10, $args = array() ) {
-		global $wpdb;
-
-		return $wpdb->get_col( $wpdb->prepare(
-			"
+    /**
+     * 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;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+
+    /**
+     * Wordlift_Reference_Rebuild_Service constructor.
+     *
+     * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     */
+    public function __construct( $entity_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Reference_Rebuild_Service' );
+
+        $this->entity_service = $entity_service;
+    }
+
+    public function rebuild() {
+        set_time_limit( 21600 ); // 6 hours
+
+        // Send textual output.
+        header( 'Content-type: text/plain; charset=utf-8' );
+
+        // We start at 0 by default and get to max.
+        $offset = isset( $_GET['offset'] ) ? (int) $_GET['offset'] : 0;
+        $limit  = isset( $_GET['limit'] ) ? (int) $_GET['limit'] : 1;
+        $max    = $offset + $limit;
+
+        $this->log->debug( 'Processing references...' );
+
+        // Go through the list of published entities and posts and call the (legacy)
+        // `wl_linked_data_save_post` function for each one. We're using the `process`
+        // function which is provided by the parent `Wordlift_Listable` abstract class
+        // and will cycle through all the posts w/ a very small memory footprint
+        // in order to avoid memory errors.
+
+        $count          = 0;
+        $log            = $this->log;
+        $entity_service = $this->entity_service;
+
+        $this->process(
+            function ( $post_id ) use ( &$count, $log, $entity_service ) {
+                $count ++;
+
+                if ( $entity_service->is_entity( $post_id ) ) {
+                    $log->trace( "Post $post_id is an entity, skipping..." );
+
+                    return;
+                }
+
+                $log->trace( "Going to save post $count, ID $post_id..." );
+                do_action( 'wl_legacy_linked_data__push', $post_id );
+            },
+            array(),
+            $offset,
+            $max
+        );
+
+        // Redirect to the next chunk.
+        if ( $count == $limit ) {
+            $log->trace( 'Redirecting to post #' . ( $offset + 1 ) . '...' );
+            $url = admin_url( 'admin-ajax.php?action=wl_rebuild_references&offset=' . ( $offset + $limit ) . '&limit=' . $limit );
+            $this->redirect( $url );
+        }
+
+        $this->log->info( "Rebuild complete" );
+        echo( "Rebuild complete" );
+
+        // If we're being called as AJAX, die here.
+        if ( DOING_AJAX ) {
+            wp_die();
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function find( $offset = 0, $limit = 10, $args = array() ) {
+        global $wpdb;
+
+        return $wpdb->get_col( $wpdb->prepare(
+            "
 			SELECT DISTINCT subject_id AS id
 			FROM {$wpdb->prefix}wl_relation_instances
 			LIMIT %d OFFSET %d
 			",
-			$limit,
-			$offset
-		) );
+            $limit,
+            $offset
+        ) );
 
-	}
+    }
 
 }

Spacing +23 added lines, -23 removed lines

@@ -26,25 +26,25 @@ 
 	 *
 	 * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
 	 */
-	public function __construct( $entity_service ) {
+	public function __construct($entity_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Reference_Rebuild_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Reference_Rebuild_Service');
 
 		$this->entity_service = $entity_service;
 	}
 
 	public function rebuild() {
-		set_time_limit( 21600 ); // 6 hours
+		set_time_limit(21600); // 6 hours
 
 		// Send textual output.
-		header( 'Content-type: text/plain; charset=utf-8' );
+		header('Content-type: text/plain; charset=utf-8');
 
 		// We start at 0 by default and get to max.
-		$offset = isset( $_GET['offset'] ) ? (int) $_GET['offset'] : 0;
-		$limit  = isset( $_GET['limit'] ) ? (int) $_GET['limit'] : 1;
+		$offset = isset($_GET['offset']) ? (int) $_GET['offset'] : 0;
+		$limit  = isset($_GET['limit']) ? (int) $_GET['limit'] : 1;
 		$max    = $offset + $limit;
 
-		$this->log->debug( 'Processing references...' );
+		$this->log->debug('Processing references...');
 
 		// Go through the list of published entities and posts and call the (legacy)
 		// `wl_linked_data_save_post` function for each one. We're using the `process`
@@ -57,17 +57,17 @@ 
 		$entity_service = $this->entity_service;
 
 		$this->process(
-			function ( $post_id ) use ( &$count, $log, $entity_service ) {
-				$count ++;
+			function($post_id) use (&$count, $log, $entity_service) {
+				$count++;
 
-				if ( $entity_service->is_entity( $post_id ) ) {
-					$log->trace( "Post $post_id is an entity, skipping..." );
+				if ($entity_service->is_entity($post_id)) {
+					$log->trace("Post $post_id is an entity, skipping...");
 
 					return;
 				}
 
-				$log->trace( "Going to save post $count, ID $post_id..." );
-				do_action( 'wl_legacy_linked_data__push', $post_id );
+				$log->trace("Going to save post $count, ID $post_id...");
+				do_action('wl_legacy_linked_data__push', $post_id);
 			},
 			array(),
 			$offset,
@@ -75,17 +75,17 @@ 
 		);
 
 		// Redirect to the next chunk.
-		if ( $count == $limit ) {
-			$log->trace( 'Redirecting to post #' . ( $offset + 1 ) . '...' );
-			$url = admin_url( 'admin-ajax.php?action=wl_rebuild_references&offset=' . ( $offset + $limit ) . '&limit=' . $limit );
-			$this->redirect( $url );
+		if ($count == $limit) {
+			$log->trace('Redirecting to post #'.($offset + 1).'...');
+			$url = admin_url('admin-ajax.php?action=wl_rebuild_references&offset='.($offset + $limit).'&limit='.$limit);
+			$this->redirect($url);
 		}
 
-		$this->log->info( "Rebuild complete" );
-		echo( "Rebuild complete" );
+		$this->log->info("Rebuild complete");
+		echo("Rebuild complete");
 
 		// If we're being called as AJAX, die here.
-		if ( DOING_AJAX ) {
+		if (DOING_AJAX) {
 			wp_die();
 		}
 	}
@@ -93,10 +93,10 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	function find( $offset = 0, $limit = 10, $args = array() ) {
+	function find($offset = 0, $limit = 10, $args = array()) {
 		global $wpdb;
 
-		return $wpdb->get_col( $wpdb->prepare(
+		return $wpdb->get_col($wpdb->prepare(
 			"
 			SELECT DISTINCT subject_id AS id
 			FROM {$wpdb->prefix}wl_relation_instances
@@ -104,7 +104,7 @@ 
 			",
 			$limit,
 			$offset
-		) );
+		));
 
 	}
 

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

Indentation +158 added lines, -158 removed lines

@@ -20,132 +20,132 @@ 
  */
 class Wordlift_Rebuild_Service extends Wordlift_Listable {
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * A {@link Wordlift_Sparql_Service} instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance.
-	 */
-	private $sparql_service;
-
-	/**
-	 * The {@link Wordlift_Uri_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Uri_Service $uri_service The {@link Wordlift_Uri_Service} instance.
-	 */
-	private $uri_service;
-
-	/**
-	 * Create an instance of Wordlift_Rebuild_Service.
-	 *
-	 * @param \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance used to query the remote dataset.
-	 * @param \Wordlift_Uri_Service $uri_service
-	 *
-	 * @since 3.6.0
-	 *
-	 */
-	public function __construct( $sparql_service, $uri_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Rebuild_Service' );
-
-		$this->sparql_service = $sparql_service;
-		$this->uri_service    = $uri_service;
-	}
-
-	/**
-	 * Rebuild the Linked Data remote dataset by clearing it out and repopulating
-	 * it with local data.
-	 *
-	 * @since 3.6.0
-	 */
-	public function rebuild() {
-
-		ob_clean();
-
-		// Give ourselves some time to process the data.
-		set_time_limit( 21600 ); // 6 hours
-
-		// Send textual output.
-		header( 'Content-type: text/plain; charset=utf-8' );
-
-		// We start at 0 by default and get to max.
-		$offset = isset( $_GET['offset'] )  ? (int) $_GET['offset'] : 0;
-		$limit  = isset( $_GET['limit'] )  ? (int) $_GET['limit'] : 1;
-		$max    = $offset + $limit;
-
-		// Whether we should run queries asynchronously, this is handled in `wordlift_constants.php`.
-		$asynchronous = isset( $_GET['wl-async'] ) && 'true' === $_GET['wl-async'];
-
-		// If we're starting at offset 0, then delete existing URIs and data from
-		// the remote dataset.
-		if ( 0 === $offset ) {
-
-			// Clear out all generated URIs, since the dataset URI might have changed
-			// in the process.
-			$this->uri_service->delete_all();
-
-			// Delete all the triples in the remote dataset.
-			$this->sparql_service->execute( 'DELETE { ?s ?p ?o } WHERE { ?s ?p ?o };' );
-
-		}
-
-		// Go through the list of published entities and posts and call the (legacy)
-		// `wl_linked_data_save_post` function for each one. We're using the `process`
-		// function which is provided by the parent `Wordlift_Listable` abstract class
-		// and will cycle through all the posts w/ a very small memory footprint
-		// in order to avoid memory errors.
-
-		$count = 0;
-		$log   = $this->log;
-		$this->process( function ( $post ) use ( &$count, $log ) {
-			$count ++;
-			$log->trace( "Going to save post $count, ID $post->ID..." );
-			if ( function_exists( 'wl_linked_data_save_post' ) ) {
-				wl_linked_data_save_post( $post->ID );
-			}
-		}, array(
-			'post_status' => 'publish',
-		), $offset, $max );
-
-		// Redirect to the next chunk.
-		if ( $count == $limit ) {
-			$log->trace( 'Redirecting to post #' . ( $offset + 1 ) . '...' );
-			$this->redirect( admin_url( 'admin-ajax.php?action=wl_rebuild&offset=' . ( $offset + $limit ) . '&limit=' . $limit . '&wl-async=' . ( $asynchronous ? 'true' : 'false' ) ) );
-		}
-
-		// Flush the cache.
-		Wordlift_File_Cache_Service::flush_all();
-
-		// Rebuild also the references.
-		$this->redirect( admin_url( 'admin-ajax.php?action=wl_rebuild_references' ) );
-	}
-
-	/**
-	 * Redirect using a client-side meta to avoid browsers' redirect restrictions.
-	 *
-	 * @param string $url The URL to redirect to.
-	 *
-	 * @since 3.9.8
-	 *
-	 */
-	public function redirect( $url ) {
-
-		ob_clean();
-
-		@header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
-		?>
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * A {@link Wordlift_Sparql_Service} instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance.
+     */
+    private $sparql_service;
+
+    /**
+     * The {@link Wordlift_Uri_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Uri_Service $uri_service The {@link Wordlift_Uri_Service} instance.
+     */
+    private $uri_service;
+
+    /**
+     * Create an instance of Wordlift_Rebuild_Service.
+     *
+     * @param \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance used to query the remote dataset.
+     * @param \Wordlift_Uri_Service $uri_service
+     *
+     * @since 3.6.0
+     *
+     */
+    public function __construct( $sparql_service, $uri_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Rebuild_Service' );
+
+        $this->sparql_service = $sparql_service;
+        $this->uri_service    = $uri_service;
+    }
+
+    /**
+     * Rebuild the Linked Data remote dataset by clearing it out and repopulating
+     * it with local data.
+     *
+     * @since 3.6.0
+     */
+    public function rebuild() {
+
+        ob_clean();
+
+        // Give ourselves some time to process the data.
+        set_time_limit( 21600 ); // 6 hours
+
+        // Send textual output.
+        header( 'Content-type: text/plain; charset=utf-8' );
+
+        // We start at 0 by default and get to max.
+        $offset = isset( $_GET['offset'] )  ? (int) $_GET['offset'] : 0;
+        $limit  = isset( $_GET['limit'] )  ? (int) $_GET['limit'] : 1;
+        $max    = $offset + $limit;
+
+        // Whether we should run queries asynchronously, this is handled in `wordlift_constants.php`.
+        $asynchronous = isset( $_GET['wl-async'] ) && 'true' === $_GET['wl-async'];
+
+        // If we're starting at offset 0, then delete existing URIs and data from
+        // the remote dataset.
+        if ( 0 === $offset ) {
+
+            // Clear out all generated URIs, since the dataset URI might have changed
+            // in the process.
+            $this->uri_service->delete_all();
+
+            // Delete all the triples in the remote dataset.
+            $this->sparql_service->execute( 'DELETE { ?s ?p ?o } WHERE { ?s ?p ?o };' );
+
+        }
+
+        // Go through the list of published entities and posts and call the (legacy)
+        // `wl_linked_data_save_post` function for each one. We're using the `process`
+        // function which is provided by the parent `Wordlift_Listable` abstract class
+        // and will cycle through all the posts w/ a very small memory footprint
+        // in order to avoid memory errors.
+
+        $count = 0;
+        $log   = $this->log;
+        $this->process( function ( $post ) use ( &$count, $log ) {
+            $count ++;
+            $log->trace( "Going to save post $count, ID $post->ID..." );
+            if ( function_exists( 'wl_linked_data_save_post' ) ) {
+                wl_linked_data_save_post( $post->ID );
+            }
+        }, array(
+            'post_status' => 'publish',
+        ), $offset, $max );
+
+        // Redirect to the next chunk.
+        if ( $count == $limit ) {
+            $log->trace( 'Redirecting to post #' . ( $offset + 1 ) . '...' );
+            $this->redirect( admin_url( 'admin-ajax.php?action=wl_rebuild&offset=' . ( $offset + $limit ) . '&limit=' . $limit . '&wl-async=' . ( $asynchronous ? 'true' : 'false' ) ) );
+        }
+
+        // Flush the cache.
+        Wordlift_File_Cache_Service::flush_all();
+
+        // Rebuild also the references.
+        $this->redirect( admin_url( 'admin-ajax.php?action=wl_rebuild_references' ) );
+    }
+
+    /**
+     * Redirect using a client-side meta to avoid browsers' redirect restrictions.
+     *
+     * @param string $url The URL to redirect to.
+     *
+     * @since 3.9.8
+     *
+     */
+    public function redirect( $url ) {
+
+        ob_clean();
+
+        @header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
+        ?>
         <html>
         <head>
             <meta http-equiv="refresh"
@@ -157,37 +157,37 @@ 
         </html>
 		<?php
 
-		exit;
-
-	}
-
-	/**
-	 * List the items starting at the specified offset and up to the specified limit.
-	 *
-	 * @param int $offset The start offset.
-	 * @param int $limit The maximum number of items to return.
-	 * @param array $args Additional arguments.
-	 *
-	 * @return array A array of items (or an empty array if no items are found).
-	 * @since 3.19.5 remove Polylang hooks.
-	 * @since 3.6.0
-	 *
-	 */
-	function find( $offset = 0, $limit = 10, $args = array() ) {
-
-		$actual_args = wp_parse_args( $args, Wordlift_Entity_Service::add_criterias( array(
-			'offset'        => $offset,
-			'numberposts'   => $limit,
-			'fields'        => 'all',
-			'orderby'       => 'ID',
-			'order'         => 'ASC',
-			'post_status'   => 'any',
-			'cache_results' => false,
-		) ) );
-
-		$this->log->trace( 'Using ' . var_export( $actual_args, true ) );
-
-		return get_posts( $actual_args );
-	}
+        exit;
+
+    }
+
+    /**
+     * List the items starting at the specified offset and up to the specified limit.
+     *
+     * @param int $offset The start offset.
+     * @param int $limit The maximum number of items to return.
+     * @param array $args Additional arguments.
+     *
+     * @return array A array of items (or an empty array if no items are found).
+     * @since 3.19.5 remove Polylang hooks.
+     * @since 3.6.0
+     *
+     */
+    function find( $offset = 0, $limit = 10, $args = array() ) {
+
+        $actual_args = wp_parse_args( $args, Wordlift_Entity_Service::add_criterias( array(
+            'offset'        => $offset,
+            'numberposts'   => $limit,
+            'fields'        => 'all',
+            'orderby'       => 'ID',
+            'order'         => 'ASC',
+            'post_status'   => 'any',
+            'cache_results' => false,
+        ) ) );
+
+        $this->log->trace( 'Using ' . var_export( $actual_args, true ) );
+
+        return get_posts( $actual_args );
+    }
 
 }

Spacing +27 added lines, -27 removed lines

@@ -56,9 +56,9 @@ 
 	 * @since 3.6.0
 	 *
 	 */
-	public function __construct( $sparql_service, $uri_service ) {
+	public function __construct($sparql_service, $uri_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Rebuild_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Rebuild_Service');
 
 		$this->sparql_service = $sparql_service;
 		$this->uri_service    = $uri_service;
@@ -75,29 +75,29 @@ 
 		ob_clean();
 
 		// Give ourselves some time to process the data.
-		set_time_limit( 21600 ); // 6 hours
+		set_time_limit(21600); // 6 hours
 
 		// Send textual output.
-		header( 'Content-type: text/plain; charset=utf-8' );
+		header('Content-type: text/plain; charset=utf-8');
 
 		// We start at 0 by default and get to max.
-		$offset = isset( $_GET['offset'] )  ? (int) $_GET['offset'] : 0;
-		$limit  = isset( $_GET['limit'] )  ? (int) $_GET['limit'] : 1;
+		$offset = isset($_GET['offset']) ? (int) $_GET['offset'] : 0;
+		$limit  = isset($_GET['limit']) ? (int) $_GET['limit'] : 1;
 		$max    = $offset + $limit;
 
 		// Whether we should run queries asynchronously, this is handled in `wordlift_constants.php`.
-		$asynchronous = isset( $_GET['wl-async'] ) && 'true' === $_GET['wl-async'];
+		$asynchronous = isset($_GET['wl-async']) && 'true' === $_GET['wl-async'];
 
 		// If we're starting at offset 0, then delete existing URIs and data from
 		// the remote dataset.
-		if ( 0 === $offset ) {
+		if (0 === $offset) {
 
 			// Clear out all generated URIs, since the dataset URI might have changed
 			// in the process.
 			$this->uri_service->delete_all();
 
 			// Delete all the triples in the remote dataset.
-			$this->sparql_service->execute( 'DELETE { ?s ?p ?o } WHERE { ?s ?p ?o };' );
+			$this->sparql_service->execute('DELETE { ?s ?p ?o } WHERE { ?s ?p ?o };');
 
 		}
 
@@ -109,27 +109,27 @@ 
 
 		$count = 0;
 		$log   = $this->log;
-		$this->process( function ( $post ) use ( &$count, $log ) {
-			$count ++;
-			$log->trace( "Going to save post $count, ID $post->ID..." );
-			if ( function_exists( 'wl_linked_data_save_post' ) ) {
-				wl_linked_data_save_post( $post->ID );
+		$this->process(function($post) use (&$count, $log) {
+			$count++;
+			$log->trace("Going to save post $count, ID $post->ID...");
+			if (function_exists('wl_linked_data_save_post')) {
+				wl_linked_data_save_post($post->ID);
 			}
 		}, array(
 			'post_status' => 'publish',
-		), $offset, $max );
+		), $offset, $max);
 
 		// Redirect to the next chunk.
-		if ( $count == $limit ) {
-			$log->trace( 'Redirecting to post #' . ( $offset + 1 ) . '...' );
-			$this->redirect( admin_url( 'admin-ajax.php?action=wl_rebuild&offset=' . ( $offset + $limit ) . '&limit=' . $limit . '&wl-async=' . ( $asynchronous ? 'true' : 'false' ) ) );
+		if ($count == $limit) {
+			$log->trace('Redirecting to post #'.($offset + 1).'...');
+			$this->redirect(admin_url('admin-ajax.php?action=wl_rebuild&offset='.($offset + $limit).'&limit='.$limit.'&wl-async='.($asynchronous ? 'true' : 'false')));
 		}
 
 		// Flush the cache.
 		Wordlift_File_Cache_Service::flush_all();
 
 		// Rebuild also the references.
-		$this->redirect( admin_url( 'admin-ajax.php?action=wl_rebuild_references' ) );
+		$this->redirect(admin_url('admin-ajax.php?action=wl_rebuild_references'));
 	}
 
 	/**
@@ -140,16 +140,16 @@ 
 	 * @since 3.9.8
 	 *
 	 */
-	public function redirect( $url ) {
+	public function redirect($url) {
 
 		ob_clean();
 
-		@header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
+		@header('Content-Type: text/html; charset='.get_option('blog_charset'));
 		?>
         <html>
         <head>
             <meta http-equiv="refresh"
-                  content="0; <?php echo esc_attr( $url ); ?>">
+                  content="0; <?php echo esc_attr($url); ?>">
         </head>
         <body>
         Rebuilding, please wait...
@@ -173,9 +173,9 @@ 
 	 * @since 3.6.0
 	 *
 	 */
-	function find( $offset = 0, $limit = 10, $args = array() ) {
+	function find($offset = 0, $limit = 10, $args = array()) {
 
-		$actual_args = wp_parse_args( $args, Wordlift_Entity_Service::add_criterias( array(
+		$actual_args = wp_parse_args($args, Wordlift_Entity_Service::add_criterias(array(
 			'offset'        => $offset,
 			'numberposts'   => $limit,
 			'fields'        => 'all',
@@ -183,11 +183,11 @@ 
 			'order'         => 'ASC',
 			'post_status'   => 'any',
 			'cache_results' => false,
-		) ) );
+		)));
 
-		$this->log->trace( 'Using ' . var_export( $actual_args, true ) );
+		$this->log->trace('Using '.var_export($actual_args, true));
 
-		return get_posts( $actual_args );
+		return get_posts($actual_args);
 	}
 
 }

src/includes/batch/class-wordlift-batch-operation-ajax-adapter.php

Indentation +130 added lines, -130 removed lines

@@ -14,135 +14,135 @@
  */
 class Wordlift_Batch_Operation_Ajax_Adapter {
 
-	/**
-	 * The access levels.
-	 *
-	 * @since 3.20.0
-	 */
-	const ACCESS_ANONYMOUS = 1;
-	const ACCESS_ADMIN = 2;
-	const ACCESS_ALL = 3;
-
-	/**
-	 * A {@link Wordlift_Batch_Operation_Interface} instance.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var \Wordlift_Batch_Operation_Interface $operation A {@link Wordlift_Batch_Operation_Interface} instance.
-	 */
-	private $operation;
-
-	/**
-	 * The ajax action name.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var string $action The ajax action name.
-	 */
-	private $action;
-
-	/**
-	 * Wordlift_Batch_Operation_Ajax_Adapter constructor.
-	 *
-	 * @param \Wordlift_Batch_Operation_Interface $operation The batch operation.
-	 * @param string $action The action name.
-	 * @param int $access The access level.
-	 */
-	public function __construct( $operation, $action, $access = self::ACCESS_ADMIN ) {
-
-		$this->operation = $operation;
-
-		if ( $access & self::ACCESS_ADMIN ) {
-			add_action( "wp_ajax_$action", array( $this, 'process' ) );
-			add_action( "wp_ajax_{$action}_count", array( $this, 'count' ) );
-
-			// Add the nonce for the `schemaorg_sync` action.
-			add_filter( 'wl_admin_settings', array( $this, 'add_nonce' ) );
-		}
-
-		if ( $access & self::ACCESS_ANONYMOUS ) {
-			add_action( "wp_ajax_nopriv_$action", array( $this, 'process' ) );
-			add_action( "wp_ajax_nopriv_{$action}_count", array( $this, 'count' ) );
-		}
-
-		$this->action = $action;
-	}
-
-	/**
-	 * Hook to `wl_admin_settings`, adds the nonce.
-	 *
-	 * @param array $params An array of settings.
-	 *
-	 * @return array The updated array of settings.
-	 * @since 3.20.0
-	 *
-	 */
-	public function add_nonce( $params ) {
-
-		return array_merge( $params, array(
-			"{$this->action}_nonce" => $this->create_nonce(),
-		) );
-	}
-
-	/**
-	 * Process the requested operation.
-	 *
-	 * @since 3.20.0
-	 */
-	public function process() {
-		$nonce = isset( $_POST['_nonce'] ) ? (string) $_POST['_nonce'] : '';
-		// Validate the nonce.
-		if ( ! wp_verify_nonce( $nonce, $this->action ) ) {
-			wp_send_json_error( 'Invalid nonce.' );
-		}
-
-		$offset = isset( $_POST['offset'] ) ? (int) $_POST['offset'] : 0;
-		$limit  = isset( $_POST['limit'] ) ? (int) $_POST['limit'] : 10;
-
-		// Run the batch operation.
-		$result = $this->operation->process( $offset, $limit );
-
-		// Send the results along with a potentially updated nonce.
-		wp_send_json_success( array_merge( $result, array(
-			'_nonce' => $this->create_nonce(),
-		) ) );
-
-	}
-
-	/**
-	 * Count the number of elements that would be affected by the operation.
-	 *
-	 * @since 3.20.0
-	 */
-	public function count() {
-
-		// Validate the nonce.
-		$nonce = isset( $_POST['_nonce'] ) ? (string) $_POST['_nonce'] : '';
-		if ( ! wp_verify_nonce( $nonce, $this->action ) ) {
-			wp_send_json_error( 'Invalid nonce.' );
-		}
-
-		// Run the batch operation.
-		$result = $this->operation->count();
-
-		// Send the results along with a potentially updated nonce.
-		wp_send_json_success( array(
-			'count'  => $result,
-			'_nonce' => $this->create_nonce(),
-		) );
-
-	}
-
-	/**
-	 * Create a nonce for the ajax operation.
-	 *
-	 * @return string The nonce.
-	 * @since 3.20.0
-	 *
-	 */
-	public function create_nonce() {
-
-		return wp_create_nonce( $this->action );
-	}
+    /**
+     * The access levels.
+     *
+     * @since 3.20.0
+     */
+    const ACCESS_ANONYMOUS = 1;
+    const ACCESS_ADMIN = 2;
+    const ACCESS_ALL = 3;
+
+    /**
+     * A {@link Wordlift_Batch_Operation_Interface} instance.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var \Wordlift_Batch_Operation_Interface $operation A {@link Wordlift_Batch_Operation_Interface} instance.
+     */
+    private $operation;
+
+    /**
+     * The ajax action name.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var string $action The ajax action name.
+     */
+    private $action;
+
+    /**
+     * Wordlift_Batch_Operation_Ajax_Adapter constructor.
+     *
+     * @param \Wordlift_Batch_Operation_Interface $operation The batch operation.
+     * @param string $action The action name.
+     * @param int $access The access level.
+     */
+    public function __construct( $operation, $action, $access = self::ACCESS_ADMIN ) {
+
+        $this->operation = $operation;
+
+        if ( $access & self::ACCESS_ADMIN ) {
+            add_action( "wp_ajax_$action", array( $this, 'process' ) );
+            add_action( "wp_ajax_{$action}_count", array( $this, 'count' ) );
+
+            // Add the nonce for the `schemaorg_sync` action.
+            add_filter( 'wl_admin_settings', array( $this, 'add_nonce' ) );
+        }
+
+        if ( $access & self::ACCESS_ANONYMOUS ) {
+            add_action( "wp_ajax_nopriv_$action", array( $this, 'process' ) );
+            add_action( "wp_ajax_nopriv_{$action}_count", array( $this, 'count' ) );
+        }
+
+        $this->action = $action;
+    }
+
+    /**
+     * Hook to `wl_admin_settings`, adds the nonce.
+     *
+     * @param array $params An array of settings.
+     *
+     * @return array The updated array of settings.
+     * @since 3.20.0
+     *
+     */
+    public function add_nonce( $params ) {
+
+        return array_merge( $params, array(
+            "{$this->action}_nonce" => $this->create_nonce(),
+        ) );
+    }
+
+    /**
+     * Process the requested operation.
+     *
+     * @since 3.20.0
+     */
+    public function process() {
+        $nonce = isset( $_POST['_nonce'] ) ? (string) $_POST['_nonce'] : '';
+        // Validate the nonce.
+        if ( ! wp_verify_nonce( $nonce, $this->action ) ) {
+            wp_send_json_error( 'Invalid nonce.' );
+        }
+
+        $offset = isset( $_POST['offset'] ) ? (int) $_POST['offset'] : 0;
+        $limit  = isset( $_POST['limit'] ) ? (int) $_POST['limit'] : 10;
+
+        // Run the batch operation.
+        $result = $this->operation->process( $offset, $limit );
+
+        // Send the results along with a potentially updated nonce.
+        wp_send_json_success( array_merge( $result, array(
+            '_nonce' => $this->create_nonce(),
+        ) ) );
+
+    }
+
+    /**
+     * Count the number of elements that would be affected by the operation.
+     *
+     * @since 3.20.0
+     */
+    public function count() {
+
+        // Validate the nonce.
+        $nonce = isset( $_POST['_nonce'] ) ? (string) $_POST['_nonce'] : '';
+        if ( ! wp_verify_nonce( $nonce, $this->action ) ) {
+            wp_send_json_error( 'Invalid nonce.' );
+        }
+
+        // Run the batch operation.
+        $result = $this->operation->count();
+
+        // Send the results along with a potentially updated nonce.
+        wp_send_json_success( array(
+            'count'  => $result,
+            '_nonce' => $this->create_nonce(),
+        ) );
+
+    }
+
+    /**
+     * Create a nonce for the ajax operation.
+     *
+     * @return string The nonce.
+     * @since 3.20.0
+     *
+     */
+    public function create_nonce() {
+
+        return wp_create_nonce( $this->action );
+    }
 
 }

Spacing +25 added lines, -25 removed lines

@@ -48,21 +48,21 @@ 
 	 * @param string $action The action name.
 	 * @param int $access The access level.
 	 */
-	public function __construct( $operation, $action, $access = self::ACCESS_ADMIN ) {
+	public function __construct($operation, $action, $access = self::ACCESS_ADMIN) {
 
 		$this->operation = $operation;
 
-		if ( $access & self::ACCESS_ADMIN ) {
-			add_action( "wp_ajax_$action", array( $this, 'process' ) );
-			add_action( "wp_ajax_{$action}_count", array( $this, 'count' ) );
+		if ($access & self::ACCESS_ADMIN) {
+			add_action("wp_ajax_$action", array($this, 'process'));
+			add_action("wp_ajax_{$action}_count", array($this, 'count'));
 
 			// Add the nonce for the `schemaorg_sync` action.
-			add_filter( 'wl_admin_settings', array( $this, 'add_nonce' ) );
+			add_filter('wl_admin_settings', array($this, 'add_nonce'));
 		}
 
-		if ( $access & self::ACCESS_ANONYMOUS ) {
-			add_action( "wp_ajax_nopriv_$action", array( $this, 'process' ) );
-			add_action( "wp_ajax_nopriv_{$action}_count", array( $this, 'count' ) );
+		if ($access & self::ACCESS_ANONYMOUS) {
+			add_action("wp_ajax_nopriv_$action", array($this, 'process'));
+			add_action("wp_ajax_nopriv_{$action}_count", array($this, 'count'));
 		}
 
 		$this->action = $action;
@@ -77,11 +77,11 @@ 
 	 * @since 3.20.0
 	 *
 	 */
-	public function add_nonce( $params ) {
+	public function add_nonce($params) {
 
-		return array_merge( $params, array(
+		return array_merge($params, array(
 			"{$this->action}_nonce" => $this->create_nonce(),
-		) );
+		));
 	}
 
 	/**
@@ -90,22 +90,22 @@ 
 	 * @since 3.20.0
 	 */
 	public function process() {
-		$nonce = isset( $_POST['_nonce'] ) ? (string) $_POST['_nonce'] : '';
+		$nonce = isset($_POST['_nonce']) ? (string) $_POST['_nonce'] : '';
 		// Validate the nonce.
-		if ( ! wp_verify_nonce( $nonce, $this->action ) ) {
-			wp_send_json_error( 'Invalid nonce.' );
+		if ( ! wp_verify_nonce($nonce, $this->action)) {
+			wp_send_json_error('Invalid nonce.');
 		}
 
-		$offset = isset( $_POST['offset'] ) ? (int) $_POST['offset'] : 0;
-		$limit  = isset( $_POST['limit'] ) ? (int) $_POST['limit'] : 10;
+		$offset = isset($_POST['offset']) ? (int) $_POST['offset'] : 0;
+		$limit  = isset($_POST['limit']) ? (int) $_POST['limit'] : 10;
 
 		// Run the batch operation.
-		$result = $this->operation->process( $offset, $limit );
+		$result = $this->operation->process($offset, $limit);
 
 		// Send the results along with a potentially updated nonce.
-		wp_send_json_success( array_merge( $result, array(
+		wp_send_json_success(array_merge($result, array(
 			'_nonce' => $this->create_nonce(),
-		) ) );
+		)));
 
 	}
 
@@ -117,19 +117,19 @@ 
 	public function count() {
 
 		// Validate the nonce.
-		$nonce = isset( $_POST['_nonce'] ) ? (string) $_POST['_nonce'] : '';
-		if ( ! wp_verify_nonce( $nonce, $this->action ) ) {
-			wp_send_json_error( 'Invalid nonce.' );
+		$nonce = isset($_POST['_nonce']) ? (string) $_POST['_nonce'] : '';
+		if ( ! wp_verify_nonce($nonce, $this->action)) {
+			wp_send_json_error('Invalid nonce.');
 		}
 
 		// Run the batch operation.
 		$result = $this->operation->count();
 
 		// Send the results along with a potentially updated nonce.
-		wp_send_json_success( array(
+		wp_send_json_success(array(
 			'count'  => $result,
 			'_nonce' => $this->create_nonce(),
-		) );
+		));
 
 	}
 
@@ -142,7 +142,7 @@ 
 	 */
 	public function create_nonce() {
 
-		return wp_create_nonce( $this->action );
+		return wp_create_nonce($this->action);
 	}
 
 }

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

Indentation +54 added lines, -54 removed lines

@@ -8,79 +8,79 @@
 
 class Wordlift_Mapping_Ajax_Adapter {
 
-	/**
-	 * The {@link Wordlift_Mapping_Service} instance.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var \Wordlift_Mapping_Service $mapping_service The {@link Wordlift_Mapping_Service} instance.
-	 */
-	private $mapping_service;
+    /**
+     * The {@link Wordlift_Mapping_Service} instance.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var \Wordlift_Mapping_Service $mapping_service The {@link Wordlift_Mapping_Service} instance.
+     */
+    private $mapping_service;
 
-	/**
-	 * Create a {@link Wordlift_Mapping_Ajax_Adapter} instance.
-	 *
-	 * @param Wordlift_Mapping_Service $mapping_service The {@link Wordlift_Mapping_Service} instance.
-	 *
-	 * @since 3.20.0
-	 */
-	public function __construct( $mapping_service ) {
+    /**
+     * Create a {@link Wordlift_Mapping_Ajax_Adapter} instance.
+     *
+     * @param Wordlift_Mapping_Service $mapping_service The {@link Wordlift_Mapping_Service} instance.
+     *
+     * @since 3.20.0
+     */
+    public function __construct( $mapping_service ) {
 
-		$this->mapping_service = $mapping_service;
+        $this->mapping_service = $mapping_service;
 
-		add_action( 'wp_ajax_wl_set_entity_types_for_post_type', array( $this, 'set_entity_types_for_post_type' ) );
-		add_action( 'wp_ajax_wl_update_post_type_entity_types', array( $this, 'update_post_type_entity_types' ) );
+        add_action( 'wp_ajax_wl_set_entity_types_for_post_type', array( $this, 'set_entity_types_for_post_type' ) );
+        add_action( 'wp_ajax_wl_update_post_type_entity_types', array( $this, 'update_post_type_entity_types' ) );
 
-	}
+    }
 
-	/**
-	 *
-	 */
-	public function set_entity_types_for_post_type() {
+    /**
+     *
+     */
+    public function set_entity_types_for_post_type() {
 
-		$post_type    = sanitize_text_field( $_REQUEST['post_type'] );
-		$entity_types = (array) $_REQUEST['entity_types'];
+        $post_type    = sanitize_text_field( $_REQUEST['post_type'] );
+        $entity_types = (array) $_REQUEST['entity_types'];
 
-		$this->mapping_service->set_entity_types_for_post_type( $post_type, $entity_types );
+        $this->mapping_service->set_entity_types_for_post_type( $post_type, $entity_types );
 
-		wp_send_json_success();
+        wp_send_json_success();
 
-	}
+    }
 
-	public function update_post_type_entity_types() {
+    public function update_post_type_entity_types() {
 
-		// If the nonce is invalid, return an error.
-		$nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : '';
-		if ( ! wp_verify_nonce( $nonce, 'update_post_type_entity_types' ) ) {
-			wp_send_json_error( __( 'Nonce Security Check Failed!', 'wordlift' ) );
-		}
+        // If the nonce is invalid, return an error.
+        $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : '';
+        if ( ! wp_verify_nonce( $nonce, 'update_post_type_entity_types' ) ) {
+            wp_send_json_error( __( 'Nonce Security Check Failed!', 'wordlift' ) );
+        }
 
-		if ( empty( $_REQUEST['post_type'] ) ) {
-			wp_send_json_error( __( '`post_type` is required', 'wordlift' ) );
-		}
+        if ( empty( $_REQUEST['post_type'] ) ) {
+            wp_send_json_error( __( '`post_type` is required', 'wordlift' ) );
+        }
 
-		if ( empty( $_REQUEST['entity_types'] ) ) {
-			wp_send_json_error( __( '`entity_types` is required', 'wordlift' ) );
-		}
+        if ( empty( $_REQUEST['entity_types'] ) ) {
+            wp_send_json_error( __( '`entity_types` is required', 'wordlift' ) );
+        }
 
-		// Get the post type.
-		$post_type = isset( $_REQUEST['post_type'] ) ? sanitize_text_field( $_REQUEST['post_type'] ) : '';
+        // Get the post type.
+        $post_type = isset( $_REQUEST['post_type'] ) ? sanitize_text_field( $_REQUEST['post_type'] ) : '';
 
-		// Get the entity types URIs.
-		$entity_types = isset( $_REQUEST['entity_types'] ) ? (array) $_REQUEST['entity_types'] : array();
+        // Get the entity types URIs.
+        $entity_types = isset( $_REQUEST['entity_types'] ) ? (array) $_REQUEST['entity_types'] : array();
 
-		// Get the offset.
-		$offset = isset( $_REQUEST['offset'] ) ? intval( $_REQUEST['offset'] ) : 0;
+        // Get the offset.
+        $offset = isset( $_REQUEST['offset'] ) ? intval( $_REQUEST['offset'] ) : 0;
 
-		// Update and get the results.
-		$result = $this->mapping_service->update( $post_type, $entity_types, $offset );
+        // Update and get the results.
+        $result = $this->mapping_service->update( $post_type, $entity_types, $offset );
 
-		// Add our nonce to the result.
-		$result['_nonce'] = wp_create_nonce( 'update_post_type_entity_types' );
+        // Add our nonce to the result.
+        $result['_nonce'] = wp_create_nonce( 'update_post_type_entity_types' );
 
-		// Finally send the results.
-		wp_send_json_success( $result );
+        // Finally send the results.
+        wp_send_json_success( $result );
 
-	}
+    }
 
 }

Spacing +18 added lines, -18 removed lines

@@ -24,12 +24,12 @@ 
 	 *
 	 * @since 3.20.0
 	 */
-	public function __construct( $mapping_service ) {
+	public function __construct($mapping_service) {
 
 		$this->mapping_service = $mapping_service;
 
-		add_action( 'wp_ajax_wl_set_entity_types_for_post_type', array( $this, 'set_entity_types_for_post_type' ) );
-		add_action( 'wp_ajax_wl_update_post_type_entity_types', array( $this, 'update_post_type_entity_types' ) );
+		add_action('wp_ajax_wl_set_entity_types_for_post_type', array($this, 'set_entity_types_for_post_type'));
+		add_action('wp_ajax_wl_update_post_type_entity_types', array($this, 'update_post_type_entity_types'));
 
 	}
 
@@ -38,10 +38,10 @@ 
 	 */
 	public function set_entity_types_for_post_type() {
 
-		$post_type    = sanitize_text_field( $_REQUEST['post_type'] );
+		$post_type    = sanitize_text_field($_REQUEST['post_type']);
 		$entity_types = (array) $_REQUEST['entity_types'];
 
-		$this->mapping_service->set_entity_types_for_post_type( $post_type, $entity_types );
+		$this->mapping_service->set_entity_types_for_post_type($post_type, $entity_types);
 
 		wp_send_json_success();
 
@@ -50,36 +50,36 @@ 
 	public function update_post_type_entity_types() {
 
 		// If the nonce is invalid, return an error.
-		$nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : '';
-		if ( ! wp_verify_nonce( $nonce, 'update_post_type_entity_types' ) ) {
-			wp_send_json_error( __( 'Nonce Security Check Failed!', 'wordlift' ) );
+		$nonce = isset($_REQUEST['_nonce']) ? $_REQUEST['_nonce'] : '';
+		if ( ! wp_verify_nonce($nonce, 'update_post_type_entity_types')) {
+			wp_send_json_error(__('Nonce Security Check Failed!', 'wordlift'));
 		}
 
-		if ( empty( $_REQUEST['post_type'] ) ) {
-			wp_send_json_error( __( '`post_type` is required', 'wordlift' ) );
+		if (empty($_REQUEST['post_type'])) {
+			wp_send_json_error(__('`post_type` is required', 'wordlift'));
 		}
 
-		if ( empty( $_REQUEST['entity_types'] ) ) {
-			wp_send_json_error( __( '`entity_types` is required', 'wordlift' ) );
+		if (empty($_REQUEST['entity_types'])) {
+			wp_send_json_error(__('`entity_types` is required', 'wordlift'));
 		}
 
 		// Get the post type.
-		$post_type = isset( $_REQUEST['post_type'] ) ? sanitize_text_field( $_REQUEST['post_type'] ) : '';
+		$post_type = isset($_REQUEST['post_type']) ? sanitize_text_field($_REQUEST['post_type']) : '';
 
 		// Get the entity types URIs.
-		$entity_types = isset( $_REQUEST['entity_types'] ) ? (array) $_REQUEST['entity_types'] : array();
+		$entity_types = isset($_REQUEST['entity_types']) ? (array) $_REQUEST['entity_types'] : array();
 
 		// Get the offset.
-		$offset = isset( $_REQUEST['offset'] ) ? intval( $_REQUEST['offset'] ) : 0;
+		$offset = isset($_REQUEST['offset']) ? intval($_REQUEST['offset']) : 0;
 
 		// Update and get the results.
-		$result = $this->mapping_service->update( $post_type, $entity_types, $offset );
+		$result = $this->mapping_service->update($post_type, $entity_types, $offset);
 
 		// Add our nonce to the result.
-		$result['_nonce'] = wp_create_nonce( 'update_post_type_entity_types' );
+		$result['_nonce'] = wp_create_nonce('update_post_type_entity_types');
 
 		// Finally send the results.
-		wp_send_json_success( $result );
+		wp_send_json_success($result);
 
 	}
 

src/wordlift/mappings/pages/class-edit-mappings-page.php

Indentation +386 added lines, -386 removed lines

@@ -24,391 +24,391 @@
  */
 class Edit_Mappings_Page extends Wordlift_Admin_Page {
 
-	/** Instance to store the registry class.
-	 * @var Mappings_Transform_Functions_Registry { @link Mappings_Transform_Functions_Registry instance}
-	 */
-	public $transform_function_registry;
-
-	/**
-	 * Edit_Mappings_Page constructor.
-	 *
-	 * @param $transform_function_registry Mappings_Transform_Functions_Registry { @link Mappings_Transform_Functions_Registry instance }
-	 */
-	public function __construct( $transform_function_registry ) {
-		parent::__construct();
-		$this->transform_function_registry = $transform_function_registry;
-	}
-
-	public function render() {
-		// Render all the settings when this method is called, because the partial page is loaded after
-		// this method.
-		// Load the UI dependencies.
-		$edit_mapping_settings = $this->get_ui_settings_array();
-		// Supply the settings to js client.
-		wp_localize_script( 'wl-mappings-edit', 'wl_edit_mappings_config', $edit_mapping_settings );
-
-		parent::render();
-	}
-
-	/**
-	 * Load the text settings needed for the edit_mappings_page.
-	 *
-	 * @param array $edit_mapping_settings Key value pair of settings used by edit mappings page.
-	 *
-	 * @return array Adding text settings to the main settings array.
-	 */
-	private function load_text_settings_for_edit_mapping_page( array $edit_mapping_settings ) {
-		$edit_mapping_settings['wl_add_mapping_text']     = __( 'Add Mapping', 'wordlift' );
-		$edit_mapping_settings['wl_edit_mapping_text']    = __( 'Edit Mapping', 'wordlift' );
-		$edit_mapping_settings['wl_edit_mapping_no_item'] = __( 'Unable to find the mapping item', 'wordlift' );
-		$edit_mapping_settings['page']                    = 'wl_edit_mapping';
-
-		return $edit_mapping_settings;
-	}
-
-	/**
-	 * The base class {@link Wordlift_Admin_Page} will add the admin page to the WordLift menu.
-	 *
-	 * We don't want this page to be in the menu though. Therefore we override the `parent_slug` so that WordPress won't
-	 * show it there.
-	 *
-	 * @return null return null to avoid this page to be displayed in WordLift's menu.
-	 */
-	protected function get_parent_slug() {
-		return null;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_page_title() {
-
-		return __( 'Edit Mappings', 'wordlift' );
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_menu_title() {
-
-		return __( 'Edit Mappings', 'wordlift' );
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_menu_slug() {
-
-		return 'wl_edit_mapping';
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_partial_name() {
-		return 'wordlift-admin-mappings-edit.php';
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function enqueue_scripts() {
-
-		// Enqueue the script.
-		Scripts_Helper::enqueue_based_on_wordpress_version(
-			'wl-mappings-edit',
-			plugin_dir_url( dirname( dirname( dirname( __FILE__ ) ) ) ) . 'js/dist/mappings-edit',
-			array( 'react', 'react-dom', 'wp-polyfill' ),
-			true
-		);
-
-		// Enqueue the style.
-		wp_enqueue_style(
-			'wl-mappings-edit',
-			plugin_dir_url( dirname( dirname( dirname( __FILE__ ) ) ) ) . 'js/dist/mappings-edit.css',
-			Wordlift::get_instance()->get_version()
-		);
-	}
-
-	/**
-	 * Returns field name options based on the chosen field type.
-	 * if string is returned a text field would be shown to user, if an array of options is returned
-	 * then the select box would be shown to user.
-	 *
-	 * @return array Array of the options.
-	 */
-	public static function get_all_field_name_options() {
-
-		$options = array(
-			array(
-				'field_type' => Wordlift\Mappings\Jsonld_Converter::FIELD_TYPE_TEXT_FIELD,
-				'value'      => '',
-				'label'      => __( 'Fixed Text', 'wordlift' ),
-			),
-			// @@todo maybe it makes sense to move this one as well to Wordlift/Mappings/Custom_Fields_Mappings.
-			array(
-				'field_type' => Wordlift\Mappings\Jsonld_Converter::FIELD_TYPE_CUSTOM_FIELD,
-				'value'      => '',
-				'label'      => __( 'Custom Field', 'wordlift' ),
-			),
-		);
-
-		/**
-		 * Allow 3rd parties to add field types.
-		 *
-		 * @param array An array of Field Types.
-		 *
-		 * @return array An array of Field Types.
-		 *
-		 * @since 3.25.0
-		 */
-		return apply_filters( 'wl_mappings_field_types', $options );
-	}
-
-	/**
-	 * @return array An Array containing key value pairs of settings.
-	 * @since 3.25.0
-	 * Load dependencies required for js client.
-	 */
-	public function get_ui_settings_array() {
-		// Create ui settings array to be used by js client.
-		$edit_mapping_settings                                  = array();
-		$edit_mapping_settings                                  = $this->load_rest_settings( $edit_mapping_settings );
-		$edit_mapping_settings                                  = $this->load_text_settings_for_edit_mapping_page( $edit_mapping_settings );
-		$edit_mapping_settings['wl_transform_function_options'] = $this->transform_function_registry->get_options();
-		$edit_mapping_settings                                  = $this->load_field_type_and_name_options( $edit_mapping_settings );
-		// Load logic field options.
-		$edit_mapping_settings = $this->load_logic_field_options( $edit_mapping_settings );
-		$edit_mapping_settings = $this->load_rule_field_options( $edit_mapping_settings );
-
-		return $edit_mapping_settings;
-	}
-
-	/**
-	 * Returns post type, post category, or any other post taxonomies
-	 * @return array An array of select options
-	 */
-	private static function get_post_taxonomies_and_terms() {
-		$taxonomy_options = array();
-		$term_options     = array();
-		$taxonomies       = get_object_taxonomies( 'post', 'objects' );
-
-		foreach ( $taxonomies as $taxonomy ) {
-			array_push(
-				$taxonomy_options,
-				array(
-					'label'      => $taxonomy->label,
-					'value'      => $taxonomy->name,
-					'api_source' => 'taxonomy'
-				)
-			);
-		}
-		// Post type is also included in the list of taxonomies, so get the post type and merge with options.
-		$post_type_array  = self::get_post_type_key_and_value();
-		$post_type_option = $post_type_array['post_type_option_name'];
-		// Get also the list of post types from the post_type_array.
-		$post_type_option_values = $post_type_array['post_type_option_values'];
-
-		$post_taxonomy_array  = self::get_post_taxonomy_key_and_value();
-		$post_taxonomy_option = $post_taxonomy_array['post_taxonomy_option_name'];
-
-		// Merge the post type option and post types in the taxonomy options
-		array_push( $taxonomy_options, $post_type_option, $post_taxonomy_option );
-		$term_options = array_merge( $term_options, $post_type_option_values );
-
-		return array(
-			'taxonomy_options' => $taxonomy_options,
-			'term_options'     => $term_options
-		);
-	}
-
-	/**
-	 * Return post type option and post type option values.
-	 *
-	 * @return array Array of post_type_option and post_type_option_values.
-	 */
-	private static function get_post_type_key_and_value() {
-		$post_type_option_name   = array(
-			'label'      => __( 'Post type', 'wordlift' ),
-			'value'      => Wordlift\Mappings\Validators\Post_Type_Rule_Validator::POST_TYPE,
-			// Left empty since post types are provided locally.
-			'api_source' => '',
-		);
-		$post_type_option_values = array();
-		$post_types              = get_post_types(
-			array(),
-			'objects'
-		);
-
-		foreach ( $post_types as $post_type ) {
-			array_push(
-				$post_type_option_values,
-				array(
-					'label'        => $post_type->label,
-					'value'        => $post_type->name,
-					'parent_value' => 'post_type',
-				)
-			);
-		}
-
-		return array(
-			'post_type_option_name'   => $post_type_option_name,
-			'post_type_option_values' => $post_type_option_values
-		);
-	}
-
-	/**
-	 * Return post type option and post type option values.
-	 *
-	 * @return array Array of post_type_option and post_type_option_values.
-	 */
-	private static function get_post_taxonomy_key_and_value() {
-
-		$post_taxonomy_option_name   = array(
-			'label'      => __( 'Post Taxonomy', 'wordlift' ),
-			'value'      => Wordlift\Mappings\Validators\Post_Taxonomy_Term_Rule_Validator::POST_TAXONOMY,
-			'api_source' => 'post_taxonomy'
-		);
-		$post_taxonomy_option_values = array();
-
-		return array(
-			'post_taxonomy_option_name'   => $post_taxonomy_option_name,
-			'post_taxonomy_option_values' => $post_taxonomy_option_values
-		);
-	}
-
-	/**
-	 * This function loads the equal to, not equal to operator to the edit mapping settings.
-	 *
-	 * @param array $edit_mapping_settings
-	 *
-	 * @return array Loads the logic field options to the $edit_mapping_settings.
-	 */
-	private function load_logic_field_options( array $edit_mapping_settings ) {
-		$edit_mapping_settings['wl_logic_field_options'] = array(
-			array(
-				'label' => __( 'is equal to', 'wordlift' ),
-				'value' => Wordlift\Mappings\Validators\Rule_Validator::IS_EQUAL_TO,
-			),
-			array(
-				'label' => __( 'is not equal to', 'wordlift' ),
-				'value' => Wordlift\Mappings\Validators\Rule_Validator::IS_NOT_EQUAL_TO,
-			),
-		);
-
-		return $edit_mapping_settings;
-	}
-
-	/**
-	 * Validates the nonce posted by client and then assign the mapping id which should be edited.
-	 *
-	 * @param array $edit_mapping_settings
-	 *
-	 * @return array Edit mapping settings array with the mapping id if the nonce is valid.
-	 */
-	private function validate_nonce_and_assign_mapping_id( array $edit_mapping_settings ) {
-		// We verify the nonce before making to load the edit mapping page for the wl_edit_mapping_id
-		if ( isset( $_REQUEST['_wl_edit_mapping_nonce'] )
-		     && wp_verify_nonce( $_REQUEST['_wl_edit_mapping_nonce'], 'wl-edit-mapping-nonce' ) ) {
-			// We're using `INPUT_GET` here because this is a link from the UI, i.e. no POST.
-			$mapping_id                                  = isset( $_REQUEST['wl_edit_mapping_id'] ) ?
-				(int) filter_var( $_REQUEST['wl_edit_mapping_id'], FILTER_VALIDATE_INT ) : 0;
-			$edit_mapping_settings['wl_edit_mapping_id'] = $mapping_id;
-		}
-
-		return $edit_mapping_settings;
-	}
-
-	/**
-	 * Load the rest settings required for the edit_mappings js client.
-	 *
-	 * @param array $edit_mapping_settings
-	 *
-	 * @return array
-	 */
-	private function load_rest_settings( array $edit_mapping_settings ) {
-		$edit_mapping_settings['rest_url']                   = get_rest_url(
-			null,
-			WL_REST_ROUTE_DEFAULT_NAMESPACE . Mappings_REST_Controller::MAPPINGS_NAMESPACE
-		);
-		$edit_mapping_settings['wl_edit_mapping_rest_nonce'] = wp_create_nonce( 'wp_rest' );
-		$edit_mapping_settings                               = $this->validate_nonce_and_assign_mapping_id( $edit_mapping_settings );
-
-		return $edit_mapping_settings;
-	}
-
-	/**
-	 * Load the rule field options in to the settings.
-	 *
-	 * @param array $edit_mapping_settings
-	 *
-	 * @return array Return the settings.
-	 */
-	private function load_rule_field_options( array $edit_mapping_settings ) {
-		// Load the rule field options.
-		$rule_field_data                                    = self::get_post_taxonomies_and_terms();
-		$edit_mapping_settings['wl_rule_field_one_options'] = $rule_field_data['taxonomy_options'];
-		$edit_mapping_settings['wl_rule_field_two_options'] = $rule_field_data['term_options'];
-
-		/**
-		 * Allow 3rd parties to add ui options.
-		 *
-		 * @param array Array of Rule field one options where each item is in format
-		 *
-		 *  array ( 'label' => string, 'value' => string, 'api_source'=>string);
-		 *
-		 *  Leave api_source empty string to ensure didnt fetch rule field two options
-		 *  from api.
-		 *
-		 * @return array Array of Rule field one options
-		 *
-		 * @since 3.27.0
-		 */
-		$edit_mapping_settings['wl_rule_field_one_options'] = apply_filters(
-			'wl_mappings_rule_field_one_options',
-			$edit_mapping_settings['wl_rule_field_one_options']
-		);
-
-		/**
-		 * Allow 3rd parties to add rule field two options.
-		 *
-		 * @param array Array of Rule field two option where each item is in format
-		 *
-		 * array ( 'label' => string, 'value' => string, 'parent_value' => string );
-		 *
-		 * where parent_value is the value of the parent option in the rule_field_one_option.
-		 *
-		 * @since 3.27.0
-		 */
-		$edit_mapping_settings['wl_rule_field_two_options'] = apply_filters(
-			'wl_mappings_rule_field_two_options',
-			$edit_mapping_settings['wl_rule_field_two_options']
-		);
-
-		return $edit_mapping_settings;
-	}
-
-	/**
-	 * Load field type and field name options to the settings array.
-	 *
-	 * @param array $edit_mapping_settings
-	 *
-	 * @return array
-	 */
-	private function load_field_type_and_name_options( array $edit_mapping_settings ) {
-		$all_field_name_options  = self::get_all_field_name_options();
-		$all_field_types_options = array_map( function ( $item ) {
-			return array(
-				'label' => $item['label'],
-				'value' => $item['field_type'],
-			);
-		}, $all_field_name_options );
-
-		$edit_mapping_settings['wl_field_type_options'] = $all_field_types_options;
-		// Add wl_edit_field_name_options.
-		$edit_mapping_settings['wl_field_name_options'] = $all_field_name_options;
-
-		return $edit_mapping_settings;
-	}
+    /** Instance to store the registry class.
+     * @var Mappings_Transform_Functions_Registry { @link Mappings_Transform_Functions_Registry instance}
+     */
+    public $transform_function_registry;
+
+    /**
+     * Edit_Mappings_Page constructor.
+     *
+     * @param $transform_function_registry Mappings_Transform_Functions_Registry { @link Mappings_Transform_Functions_Registry instance }
+     */
+    public function __construct( $transform_function_registry ) {
+        parent::__construct();
+        $this->transform_function_registry = $transform_function_registry;
+    }
+
+    public function render() {
+        // Render all the settings when this method is called, because the partial page is loaded after
+        // this method.
+        // Load the UI dependencies.
+        $edit_mapping_settings = $this->get_ui_settings_array();
+        // Supply the settings to js client.
+        wp_localize_script( 'wl-mappings-edit', 'wl_edit_mappings_config', $edit_mapping_settings );
+
+        parent::render();
+    }
+
+    /**
+     * Load the text settings needed for the edit_mappings_page.
+     *
+     * @param array $edit_mapping_settings Key value pair of settings used by edit mappings page.
+     *
+     * @return array Adding text settings to the main settings array.
+     */
+    private function load_text_settings_for_edit_mapping_page( array $edit_mapping_settings ) {
+        $edit_mapping_settings['wl_add_mapping_text']     = __( 'Add Mapping', 'wordlift' );
+        $edit_mapping_settings['wl_edit_mapping_text']    = __( 'Edit Mapping', 'wordlift' );
+        $edit_mapping_settings['wl_edit_mapping_no_item'] = __( 'Unable to find the mapping item', 'wordlift' );
+        $edit_mapping_settings['page']                    = 'wl_edit_mapping';
+
+        return $edit_mapping_settings;
+    }
+
+    /**
+     * The base class {@link Wordlift_Admin_Page} will add the admin page to the WordLift menu.
+     *
+     * We don't want this page to be in the menu though. Therefore we override the `parent_slug` so that WordPress won't
+     * show it there.
+     *
+     * @return null return null to avoid this page to be displayed in WordLift's menu.
+     */
+    protected function get_parent_slug() {
+        return null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_page_title() {
+
+        return __( 'Edit Mappings', 'wordlift' );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_menu_title() {
+
+        return __( 'Edit Mappings', 'wordlift' );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_menu_slug() {
+
+        return 'wl_edit_mapping';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_partial_name() {
+        return 'wordlift-admin-mappings-edit.php';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function enqueue_scripts() {
+
+        // Enqueue the script.
+        Scripts_Helper::enqueue_based_on_wordpress_version(
+            'wl-mappings-edit',
+            plugin_dir_url( dirname( dirname( dirname( __FILE__ ) ) ) ) . 'js/dist/mappings-edit',
+            array( 'react', 'react-dom', 'wp-polyfill' ),
+            true
+        );
+
+        // Enqueue the style.
+        wp_enqueue_style(
+            'wl-mappings-edit',
+            plugin_dir_url( dirname( dirname( dirname( __FILE__ ) ) ) ) . 'js/dist/mappings-edit.css',
+            Wordlift::get_instance()->get_version()
+        );
+    }
+
+    /**
+     * Returns field name options based on the chosen field type.
+     * if string is returned a text field would be shown to user, if an array of options is returned
+     * then the select box would be shown to user.
+     *
+     * @return array Array of the options.
+     */
+    public static function get_all_field_name_options() {
+
+        $options = array(
+            array(
+                'field_type' => Wordlift\Mappings\Jsonld_Converter::FIELD_TYPE_TEXT_FIELD,
+                'value'      => '',
+                'label'      => __( 'Fixed Text', 'wordlift' ),
+            ),
+            // @@todo maybe it makes sense to move this one as well to Wordlift/Mappings/Custom_Fields_Mappings.
+            array(
+                'field_type' => Wordlift\Mappings\Jsonld_Converter::FIELD_TYPE_CUSTOM_FIELD,
+                'value'      => '',
+                'label'      => __( 'Custom Field', 'wordlift' ),
+            ),
+        );
+
+        /**
+         * Allow 3rd parties to add field types.
+         *
+         * @param array An array of Field Types.
+         *
+         * @return array An array of Field Types.
+         *
+         * @since 3.25.0
+         */
+        return apply_filters( 'wl_mappings_field_types', $options );
+    }
+
+    /**
+     * @return array An Array containing key value pairs of settings.
+     * @since 3.25.0
+     * Load dependencies required for js client.
+     */
+    public function get_ui_settings_array() {
+        // Create ui settings array to be used by js client.
+        $edit_mapping_settings                                  = array();
+        $edit_mapping_settings                                  = $this->load_rest_settings( $edit_mapping_settings );
+        $edit_mapping_settings                                  = $this->load_text_settings_for_edit_mapping_page( $edit_mapping_settings );
+        $edit_mapping_settings['wl_transform_function_options'] = $this->transform_function_registry->get_options();
+        $edit_mapping_settings                                  = $this->load_field_type_and_name_options( $edit_mapping_settings );
+        // Load logic field options.
+        $edit_mapping_settings = $this->load_logic_field_options( $edit_mapping_settings );
+        $edit_mapping_settings = $this->load_rule_field_options( $edit_mapping_settings );
+
+        return $edit_mapping_settings;
+    }
+
+    /**
+     * Returns post type, post category, or any other post taxonomies
+     * @return array An array of select options
+     */
+    private static function get_post_taxonomies_and_terms() {
+        $taxonomy_options = array();
+        $term_options     = array();
+        $taxonomies       = get_object_taxonomies( 'post', 'objects' );
+
+        foreach ( $taxonomies as $taxonomy ) {
+            array_push(
+                $taxonomy_options,
+                array(
+                    'label'      => $taxonomy->label,
+                    'value'      => $taxonomy->name,
+                    'api_source' => 'taxonomy'
+                )
+            );
+        }
+        // Post type is also included in the list of taxonomies, so get the post type and merge with options.
+        $post_type_array  = self::get_post_type_key_and_value();
+        $post_type_option = $post_type_array['post_type_option_name'];
+        // Get also the list of post types from the post_type_array.
+        $post_type_option_values = $post_type_array['post_type_option_values'];
+
+        $post_taxonomy_array  = self::get_post_taxonomy_key_and_value();
+        $post_taxonomy_option = $post_taxonomy_array['post_taxonomy_option_name'];
+
+        // Merge the post type option and post types in the taxonomy options
+        array_push( $taxonomy_options, $post_type_option, $post_taxonomy_option );
+        $term_options = array_merge( $term_options, $post_type_option_values );
+
+        return array(
+            'taxonomy_options' => $taxonomy_options,
+            'term_options'     => $term_options
+        );
+    }
+
+    /**
+     * Return post type option and post type option values.
+     *
+     * @return array Array of post_type_option and post_type_option_values.
+     */
+    private static function get_post_type_key_and_value() {
+        $post_type_option_name   = array(
+            'label'      => __( 'Post type', 'wordlift' ),
+            'value'      => Wordlift\Mappings\Validators\Post_Type_Rule_Validator::POST_TYPE,
+            // Left empty since post types are provided locally.
+            'api_source' => '',
+        );
+        $post_type_option_values = array();
+        $post_types              = get_post_types(
+            array(),
+            'objects'
+        );
+
+        foreach ( $post_types as $post_type ) {
+            array_push(
+                $post_type_option_values,
+                array(
+                    'label'        => $post_type->label,
+                    'value'        => $post_type->name,
+                    'parent_value' => 'post_type',
+                )
+            );
+        }
+
+        return array(
+            'post_type_option_name'   => $post_type_option_name,
+            'post_type_option_values' => $post_type_option_values
+        );
+    }
+
+    /**
+     * Return post type option and post type option values.
+     *
+     * @return array Array of post_type_option and post_type_option_values.
+     */
+    private static function get_post_taxonomy_key_and_value() {
+
+        $post_taxonomy_option_name   = array(
+            'label'      => __( 'Post Taxonomy', 'wordlift' ),
+            'value'      => Wordlift\Mappings\Validators\Post_Taxonomy_Term_Rule_Validator::POST_TAXONOMY,
+            'api_source' => 'post_taxonomy'
+        );
+        $post_taxonomy_option_values = array();
+
+        return array(
+            'post_taxonomy_option_name'   => $post_taxonomy_option_name,
+            'post_taxonomy_option_values' => $post_taxonomy_option_values
+        );
+    }
+
+    /**
+     * This function loads the equal to, not equal to operator to the edit mapping settings.
+     *
+     * @param array $edit_mapping_settings
+     *
+     * @return array Loads the logic field options to the $edit_mapping_settings.
+     */
+    private function load_logic_field_options( array $edit_mapping_settings ) {
+        $edit_mapping_settings['wl_logic_field_options'] = array(
+            array(
+                'label' => __( 'is equal to', 'wordlift' ),
+                'value' => Wordlift\Mappings\Validators\Rule_Validator::IS_EQUAL_TO,
+            ),
+            array(
+                'label' => __( 'is not equal to', 'wordlift' ),
+                'value' => Wordlift\Mappings\Validators\Rule_Validator::IS_NOT_EQUAL_TO,
+            ),
+        );
+
+        return $edit_mapping_settings;
+    }
+
+    /**
+     * Validates the nonce posted by client and then assign the mapping id which should be edited.
+     *
+     * @param array $edit_mapping_settings
+     *
+     * @return array Edit mapping settings array with the mapping id if the nonce is valid.
+     */
+    private function validate_nonce_and_assign_mapping_id( array $edit_mapping_settings ) {
+        // We verify the nonce before making to load the edit mapping page for the wl_edit_mapping_id
+        if ( isset( $_REQUEST['_wl_edit_mapping_nonce'] )
+             && wp_verify_nonce( $_REQUEST['_wl_edit_mapping_nonce'], 'wl-edit-mapping-nonce' ) ) {
+            // We're using `INPUT_GET` here because this is a link from the UI, i.e. no POST.
+            $mapping_id                                  = isset( $_REQUEST['wl_edit_mapping_id'] ) ?
+                (int) filter_var( $_REQUEST['wl_edit_mapping_id'], FILTER_VALIDATE_INT ) : 0;
+            $edit_mapping_settings['wl_edit_mapping_id'] = $mapping_id;
+        }
+
+        return $edit_mapping_settings;
+    }
+
+    /**
+     * Load the rest settings required for the edit_mappings js client.
+     *
+     * @param array $edit_mapping_settings
+     *
+     * @return array
+     */
+    private function load_rest_settings( array $edit_mapping_settings ) {
+        $edit_mapping_settings['rest_url']                   = get_rest_url(
+            null,
+            WL_REST_ROUTE_DEFAULT_NAMESPACE . Mappings_REST_Controller::MAPPINGS_NAMESPACE
+        );
+        $edit_mapping_settings['wl_edit_mapping_rest_nonce'] = wp_create_nonce( 'wp_rest' );
+        $edit_mapping_settings                               = $this->validate_nonce_and_assign_mapping_id( $edit_mapping_settings );
+
+        return $edit_mapping_settings;
+    }
+
+    /**
+     * Load the rule field options in to the settings.
+     *
+     * @param array $edit_mapping_settings
+     *
+     * @return array Return the settings.
+     */
+    private function load_rule_field_options( array $edit_mapping_settings ) {
+        // Load the rule field options.
+        $rule_field_data                                    = self::get_post_taxonomies_and_terms();
+        $edit_mapping_settings['wl_rule_field_one_options'] = $rule_field_data['taxonomy_options'];
+        $edit_mapping_settings['wl_rule_field_two_options'] = $rule_field_data['term_options'];
+
+        /**
+         * Allow 3rd parties to add ui options.
+         *
+         * @param array Array of Rule field one options where each item is in format
+         *
+         *  array ( 'label' => string, 'value' => string, 'api_source'=>string);
+         *
+         *  Leave api_source empty string to ensure didnt fetch rule field two options
+         *  from api.
+         *
+         * @return array Array of Rule field one options
+         *
+         * @since 3.27.0
+         */
+        $edit_mapping_settings['wl_rule_field_one_options'] = apply_filters(
+            'wl_mappings_rule_field_one_options',
+            $edit_mapping_settings['wl_rule_field_one_options']
+        );
+
+        /**
+         * Allow 3rd parties to add rule field two options.
+         *
+         * @param array Array of Rule field two option where each item is in format
+         *
+         * array ( 'label' => string, 'value' => string, 'parent_value' => string );
+         *
+         * where parent_value is the value of the parent option in the rule_field_one_option.
+         *
+         * @since 3.27.0
+         */
+        $edit_mapping_settings['wl_rule_field_two_options'] = apply_filters(
+            'wl_mappings_rule_field_two_options',
+            $edit_mapping_settings['wl_rule_field_two_options']
+        );
+
+        return $edit_mapping_settings;
+    }
+
+    /**
+     * Load field type and field name options to the settings array.
+     *
+     * @param array $edit_mapping_settings
+     *
+     * @return array
+     */
+    private function load_field_type_and_name_options( array $edit_mapping_settings ) {
+        $all_field_name_options  = self::get_all_field_name_options();
+        $all_field_types_options = array_map( function ( $item ) {
+            return array(
+                'label' => $item['label'],
+                'value' => $item['field_type'],
+            );
+        }, $all_field_name_options );
+
+        $edit_mapping_settings['wl_field_type_options'] = $all_field_types_options;
+        // Add wl_edit_field_name_options.
+        $edit_mapping_settings['wl_field_name_options'] = $all_field_name_options;
+
+        return $edit_mapping_settings;
+    }
 
 }

Spacing +45 added lines, -45 removed lines

@@ -34,7 +34,7 @@ 
 	 *
 	 * @param $transform_function_registry Mappings_Transform_Functions_Registry { @link Mappings_Transform_Functions_Registry instance }
 	 */
-	public function __construct( $transform_function_registry ) {
+	public function __construct($transform_function_registry) {
 		parent::__construct();
 		$this->transform_function_registry = $transform_function_registry;
 	}
@@ -45,7 +45,7 @@ 
 		// Load the UI dependencies.
 		$edit_mapping_settings = $this->get_ui_settings_array();
 		// Supply the settings to js client.
-		wp_localize_script( 'wl-mappings-edit', 'wl_edit_mappings_config', $edit_mapping_settings );
+		wp_localize_script('wl-mappings-edit', 'wl_edit_mappings_config', $edit_mapping_settings);
 
 		parent::render();
 	}
@@ -57,10 +57,10 @@ 
 	 *
 	 * @return array Adding text settings to the main settings array.
 	 */
-	private function load_text_settings_for_edit_mapping_page( array $edit_mapping_settings ) {
-		$edit_mapping_settings['wl_add_mapping_text']     = __( 'Add Mapping', 'wordlift' );
-		$edit_mapping_settings['wl_edit_mapping_text']    = __( 'Edit Mapping', 'wordlift' );
-		$edit_mapping_settings['wl_edit_mapping_no_item'] = __( 'Unable to find the mapping item', 'wordlift' );
+	private function load_text_settings_for_edit_mapping_page(array $edit_mapping_settings) {
+		$edit_mapping_settings['wl_add_mapping_text']     = __('Add Mapping', 'wordlift');
+		$edit_mapping_settings['wl_edit_mapping_text']    = __('Edit Mapping', 'wordlift');
+		$edit_mapping_settings['wl_edit_mapping_no_item'] = __('Unable to find the mapping item', 'wordlift');
 		$edit_mapping_settings['page']                    = 'wl_edit_mapping';
 
 		return $edit_mapping_settings;
@@ -83,7 +83,7 @@ 
 	 */
 	public function get_page_title() {
 
-		return __( 'Edit Mappings', 'wordlift' );
+		return __('Edit Mappings', 'wordlift');
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 */
 	public function get_menu_title() {
 
-		return __( 'Edit Mappings', 'wordlift' );
+		return __('Edit Mappings', 'wordlift');
 	}
 
 	/**
@@ -117,15 +117,15 @@ 
 		// Enqueue the script.
 		Scripts_Helper::enqueue_based_on_wordpress_version(
 			'wl-mappings-edit',
-			plugin_dir_url( dirname( dirname( dirname( __FILE__ ) ) ) ) . 'js/dist/mappings-edit',
-			array( 'react', 'react-dom', 'wp-polyfill' ),
+			plugin_dir_url(dirname(dirname(dirname(__FILE__)))).'js/dist/mappings-edit',
+			array('react', 'react-dom', 'wp-polyfill'),
 			true
 		);
 
 		// Enqueue the style.
 		wp_enqueue_style(
 			'wl-mappings-edit',
-			plugin_dir_url( dirname( dirname( dirname( __FILE__ ) ) ) ) . 'js/dist/mappings-edit.css',
+			plugin_dir_url(dirname(dirname(dirname(__FILE__)))).'js/dist/mappings-edit.css',
 			Wordlift::get_instance()->get_version()
 		);
 	}
@@ -143,13 +143,13 @@ 
 			array(
 				'field_type' => Wordlift\Mappings\Jsonld_Converter::FIELD_TYPE_TEXT_FIELD,
 				'value'      => '',
-				'label'      => __( 'Fixed Text', 'wordlift' ),
+				'label'      => __('Fixed Text', 'wordlift'),
 			),
 			// @@todo maybe it makes sense to move this one as well to Wordlift/Mappings/Custom_Fields_Mappings.
 			array(
 				'field_type' => Wordlift\Mappings\Jsonld_Converter::FIELD_TYPE_CUSTOM_FIELD,
 				'value'      => '',
-				'label'      => __( 'Custom Field', 'wordlift' ),
+				'label'      => __('Custom Field', 'wordlift'),
 			),
 		);
 
@@ -162,7 +162,7 @@ 
 		 *
 		 * @since 3.25.0
 		 */
-		return apply_filters( 'wl_mappings_field_types', $options );
+		return apply_filters('wl_mappings_field_types', $options);
 	}
 
 	/**
@@ -173,13 +173,13 @@ 
 	public function get_ui_settings_array() {
 		// Create ui settings array to be used by js client.
 		$edit_mapping_settings                                  = array();
-		$edit_mapping_settings                                  = $this->load_rest_settings( $edit_mapping_settings );
-		$edit_mapping_settings                                  = $this->load_text_settings_for_edit_mapping_page( $edit_mapping_settings );
+		$edit_mapping_settings                                  = $this->load_rest_settings($edit_mapping_settings);
+		$edit_mapping_settings                                  = $this->load_text_settings_for_edit_mapping_page($edit_mapping_settings);
 		$edit_mapping_settings['wl_transform_function_options'] = $this->transform_function_registry->get_options();
-		$edit_mapping_settings                                  = $this->load_field_type_and_name_options( $edit_mapping_settings );
+		$edit_mapping_settings                                  = $this->load_field_type_and_name_options($edit_mapping_settings);
 		// Load logic field options.
-		$edit_mapping_settings = $this->load_logic_field_options( $edit_mapping_settings );
-		$edit_mapping_settings = $this->load_rule_field_options( $edit_mapping_settings );
+		$edit_mapping_settings = $this->load_logic_field_options($edit_mapping_settings);
+		$edit_mapping_settings = $this->load_rule_field_options($edit_mapping_settings);
 
 		return $edit_mapping_settings;
 	}
@@ -191,9 +191,9 @@ 
 	private static function get_post_taxonomies_and_terms() {
 		$taxonomy_options = array();
 		$term_options     = array();
-		$taxonomies       = get_object_taxonomies( 'post', 'objects' );
+		$taxonomies       = get_object_taxonomies('post', 'objects');
 
-		foreach ( $taxonomies as $taxonomy ) {
+		foreach ($taxonomies as $taxonomy) {
 			array_push(
 				$taxonomy_options,
 				array(
@@ -213,8 +213,8 @@ 
 		$post_taxonomy_option = $post_taxonomy_array['post_taxonomy_option_name'];
 
 		// Merge the post type option and post types in the taxonomy options
-		array_push( $taxonomy_options, $post_type_option, $post_taxonomy_option );
-		$term_options = array_merge( $term_options, $post_type_option_values );
+		array_push($taxonomy_options, $post_type_option, $post_taxonomy_option);
+		$term_options = array_merge($term_options, $post_type_option_values);
 
 		return array(
 			'taxonomy_options' => $taxonomy_options,
@@ -228,8 +228,8 @@ 
 	 * @return array Array of post_type_option and post_type_option_values.
 	 */
 	private static function get_post_type_key_and_value() {
-		$post_type_option_name   = array(
-			'label'      => __( 'Post type', 'wordlift' ),
+		$post_type_option_name = array(
+			'label'      => __('Post type', 'wordlift'),
 			'value'      => Wordlift\Mappings\Validators\Post_Type_Rule_Validator::POST_TYPE,
 			// Left empty since post types are provided locally.
 			'api_source' => '',
@@ -240,7 +240,7 @@ 
 			'objects'
 		);
 
-		foreach ( $post_types as $post_type ) {
+		foreach ($post_types as $post_type) {
 			array_push(
 				$post_type_option_values,
 				array(
@@ -264,8 +264,8 @@ 
 	 */
 	private static function get_post_taxonomy_key_and_value() {
 
-		$post_taxonomy_option_name   = array(
-			'label'      => __( 'Post Taxonomy', 'wordlift' ),
+		$post_taxonomy_option_name = array(
+			'label'      => __('Post Taxonomy', 'wordlift'),
 			'value'      => Wordlift\Mappings\Validators\Post_Taxonomy_Term_Rule_Validator::POST_TAXONOMY,
 			'api_source' => 'post_taxonomy'
 		);
@@ -284,14 +284,14 @@ 
 	 *
 	 * @return array Loads the logic field options to the $edit_mapping_settings.
 	 */
-	private function load_logic_field_options( array $edit_mapping_settings ) {
+	private function load_logic_field_options(array $edit_mapping_settings) {
 		$edit_mapping_settings['wl_logic_field_options'] = array(
 			array(
-				'label' => __( 'is equal to', 'wordlift' ),
+				'label' => __('is equal to', 'wordlift'),
 				'value' => Wordlift\Mappings\Validators\Rule_Validator::IS_EQUAL_TO,
 			),
 			array(
-				'label' => __( 'is not equal to', 'wordlift' ),
+				'label' => __('is not equal to', 'wordlift'),
 				'value' => Wordlift\Mappings\Validators\Rule_Validator::IS_NOT_EQUAL_TO,
 			),
 		);
@@ -306,13 +306,13 @@ 
 	 *
 	 * @return array Edit mapping settings array with the mapping id if the nonce is valid.
 	 */
-	private function validate_nonce_and_assign_mapping_id( array $edit_mapping_settings ) {
+	private function validate_nonce_and_assign_mapping_id(array $edit_mapping_settings) {
 		// We verify the nonce before making to load the edit mapping page for the wl_edit_mapping_id
-		if ( isset( $_REQUEST['_wl_edit_mapping_nonce'] )
-		     && wp_verify_nonce( $_REQUEST['_wl_edit_mapping_nonce'], 'wl-edit-mapping-nonce' ) ) {
+		if (isset($_REQUEST['_wl_edit_mapping_nonce'])
+		     && wp_verify_nonce($_REQUEST['_wl_edit_mapping_nonce'], 'wl-edit-mapping-nonce')) {
 			// We're using `INPUT_GET` here because this is a link from the UI, i.e. no POST.
-			$mapping_id                                  = isset( $_REQUEST['wl_edit_mapping_id'] ) ?
-				(int) filter_var( $_REQUEST['wl_edit_mapping_id'], FILTER_VALIDATE_INT ) : 0;
+			$mapping_id                                  = isset($_REQUEST['wl_edit_mapping_id']) ?
+				(int) filter_var($_REQUEST['wl_edit_mapping_id'], FILTER_VALIDATE_INT) : 0;
 			$edit_mapping_settings['wl_edit_mapping_id'] = $mapping_id;
 		}
 
@@ -326,13 +326,13 @@ 
 	 *
 	 * @return array
 	 */
-	private function load_rest_settings( array $edit_mapping_settings ) {
-		$edit_mapping_settings['rest_url']                   = get_rest_url(
+	private function load_rest_settings(array $edit_mapping_settings) {
+		$edit_mapping_settings['rest_url'] = get_rest_url(
 			null,
-			WL_REST_ROUTE_DEFAULT_NAMESPACE . Mappings_REST_Controller::MAPPINGS_NAMESPACE
+			WL_REST_ROUTE_DEFAULT_NAMESPACE.Mappings_REST_Controller::MAPPINGS_NAMESPACE
 		);
-		$edit_mapping_settings['wl_edit_mapping_rest_nonce'] = wp_create_nonce( 'wp_rest' );
-		$edit_mapping_settings                               = $this->validate_nonce_and_assign_mapping_id( $edit_mapping_settings );
+		$edit_mapping_settings['wl_edit_mapping_rest_nonce'] = wp_create_nonce('wp_rest');
+		$edit_mapping_settings                               = $this->validate_nonce_and_assign_mapping_id($edit_mapping_settings);
 
 		return $edit_mapping_settings;
 	}
@@ -344,7 +344,7 @@ 
 	 *
 	 * @return array Return the settings.
 	 */
-	private function load_rule_field_options( array $edit_mapping_settings ) {
+	private function load_rule_field_options(array $edit_mapping_settings) {
 		// Load the rule field options.
 		$rule_field_data                                    = self::get_post_taxonomies_and_terms();
 		$edit_mapping_settings['wl_rule_field_one_options'] = $rule_field_data['taxonomy_options'];
@@ -395,14 +395,14 @@ 
 	 *
 	 * @return array
 	 */
-	private function load_field_type_and_name_options( array $edit_mapping_settings ) {
+	private function load_field_type_and_name_options(array $edit_mapping_settings) {
 		$all_field_name_options  = self::get_all_field_name_options();
-		$all_field_types_options = array_map( function ( $item ) {
+		$all_field_types_options = array_map(function($item) {
 			return array(
 				'label' => $item['label'],
 				'value' => $item['field_type'],
 			);
-		}, $all_field_name_options );
+		}, $all_field_name_options);
 
 		$edit_mapping_settings['wl_field_type_options'] = $all_field_types_options;
 		// Add wl_edit_field_name_options.

src/wordlift/configuration/class-config.php

Indentation +166 added lines, -166 removed lines

@@ -4,192 +4,192 @@
 
 
 class Config {
-	/**
-	 * @var \Wordlift_Admin_Setup
-	 */
-	private $admin_setup;
-	/**
-	 * @var \Wordlift_Key_Validation_Service
-	 */
-	private $key_validation_service;
-	/**
-	 * @var \Wordlift_Configuration_Service
-	 */
-	private $configuration_service;
-
-	/**
-	 * Config constructor.
-	 *
-	 * @param $admin_setup \Wordlift_Admin_Setup
-	 * @param $key_validation_service \Wordlift_Key_Validation_Service
-	 * @param $configuration_service \Wordlift_Configuration_Service
-	 */
-	public function __construct( $admin_setup, $key_validation_service, $configuration_service ) {
-
-		$this->admin_setup            = $admin_setup;
-		$this->key_validation_service = $key_validation_service;
-		$this->configuration_service  = $configuration_service;
-		add_action( 'wp_ajax_nopriv_wl_config_plugin', array( $this, 'config' ) );
-
-	}
-
-	/**
-	 * Check if the key is valid and also not bound to any domain.
-	 *
-	 * @param $key string
-	 *
-	 * @return bool
-	 */
-	private function is_key_valid_and_not_bound_to_any_domain( $key ) {
-		$account_info = $this->key_validation_service->get_account_info( $key );
-
-		/**
-		 * we need to check if the key is not associated with any account
-		 * before setting it, we should check if the url is null.
-		 */
-		if ( is_wp_error( $account_info )
-		     || wp_remote_retrieve_response_code( $account_info ) !== 200 ) {
-			return false;
-		}
-
-		$account_info_json = $account_info['body'];
-
-		$account_info_data = json_decode( $account_info_json, true );
-
-		if ( ! $account_info_data ) {
-			// Invalid json returned by api.
-			return false;
-		}
-
-		$site_url = apply_filters( 'wl_production_site_url', untrailingslashit( get_option( 'home' ) ) );
-
-
-		if ( $account_info_data['url'] === null ) {
-			return true;
-		}
-
-		// Check if the key belongs to same site.
-		if ( $site_url !== untrailingslashit( $account_info_data['url'] ) ) {
-			// key already associated with another account.
-			return false;
-		}
-
-		// Return true if the key domain and site domain are the same.
-		return true;
-	}
-
-
-	public function config() {
-
-		// Perform validation check for all the parameters.
-		$required_fields = array(
-			'diagnostic',
-			'vocabulary',
-			'language',
-			'country',
-			'publisherName',
-			'publisher',
-			'license'
-		);
-
-		header( 'Access-Control-Allow-Origin: *' );
-
-		// validate all the fields before processing
-		foreach ( $required_fields as $field ) {
-			if ( ! array_key_exists( $field, $_POST ) ) {
-				wp_send_json_error( sprintf( __( 'Field %s is required', 'wordlift' ), $field ), 422 );
-
-				return;
-			}
-		}
-
-		$key = (string) $_POST['license'];
-
-		if ( ! $this->is_key_valid_and_not_bound_to_any_domain( $key ) ) {
-			wp_send_json_error( __( 'Key is not valid or associated with other domain', 'wordlift' ), 403 );
-
-			// exit if not valid.
-			return;
-		}
-
+    /**
+     * @var \Wordlift_Admin_Setup
+     */
+    private $admin_setup;
+    /**
+     * @var \Wordlift_Key_Validation_Service
+     */
+    private $key_validation_service;
+    /**
+     * @var \Wordlift_Configuration_Service
+     */
+    private $configuration_service;
+
+    /**
+     * Config constructor.
+     *
+     * @param $admin_setup \Wordlift_Admin_Setup
+     * @param $key_validation_service \Wordlift_Key_Validation_Service
+     * @param $configuration_service \Wordlift_Configuration_Service
+     */
+    public function __construct( $admin_setup, $key_validation_service, $configuration_service ) {
+
+        $this->admin_setup            = $admin_setup;
+        $this->key_validation_service = $key_validation_service;
+        $this->configuration_service  = $configuration_service;
+        add_action( 'wp_ajax_nopriv_wl_config_plugin', array( $this, 'config' ) );
+
+    }
+
+    /**
+     * Check if the key is valid and also not bound to any domain.
+     *
+     * @param $key string
+     *
+     * @return bool
+     */
+    private function is_key_valid_and_not_bound_to_any_domain( $key ) {
+        $account_info = $this->key_validation_service->get_account_info( $key );
+
+        /**
+         * we need to check if the key is not associated with any account
+         * before setting it, we should check if the url is null.
+         */
+        if ( is_wp_error( $account_info )
+             || wp_remote_retrieve_response_code( $account_info ) !== 200 ) {
+            return false;
+        }
+
+        $account_info_json = $account_info['body'];
+
+        $account_info_data = json_decode( $account_info_json, true );
+
+        if ( ! $account_info_data ) {
+            // Invalid json returned by api.
+            return false;
+        }
+
+        $site_url = apply_filters( 'wl_production_site_url', untrailingslashit( get_option( 'home' ) ) );
+
+
+        if ( $account_info_data['url'] === null ) {
+            return true;
+        }
+
+        // Check if the key belongs to same site.
+        if ( $site_url !== untrailingslashit( $account_info_data['url'] ) ) {
+            // key already associated with another account.
+            return false;
+        }
+
+        // Return true if the key domain and site domain are the same.
+        return true;
+    }
+
+
+    public function config() {
+
+        // Perform validation check for all the parameters.
+        $required_fields = array(
+            'diagnostic',
+            'vocabulary',
+            'language',
+            'country',
+            'publisherName',
+            'publisher',
+            'license'
+        );
+
+        header( 'Access-Control-Allow-Origin: *' );
+
+        // validate all the fields before processing
+        foreach ( $required_fields as $field ) {
+            if ( ! array_key_exists( $field, $_POST ) ) {
+                wp_send_json_error( sprintf( __( 'Field %s is required', 'wordlift' ), $field ), 422 );
+
+                return;
+            }
+        }
+
+        $key = (string) $_POST['license'];
+
+        if ( ! $this->is_key_valid_and_not_bound_to_any_domain( $key ) ) {
+            wp_send_json_error( __( 'Key is not valid or associated with other domain', 'wordlift' ), 403 );
+
+            // exit if not valid.
+            return;
+        }
+
 
-		// check if key is already configured, if yes then dont save settings.
-		if ( $this->configuration_service->get_key() ) {
-			wp_send_json_error( __( 'Key already configured.', 'wordlift' ), 403 );
+        // check if key is already configured, if yes then dont save settings.
+        if ( $this->configuration_service->get_key() ) {
+            wp_send_json_error( __( 'Key already configured.', 'wordlift' ), 403 );
 
-			// key already configured
-			return;
-		}
+            // key already configured
+            return;
+        }
 
-		$this->admin_setup->save_configuration( $this->get_params() );
+        $this->admin_setup->save_configuration( $this->get_params() );
 
 
-		wp_send_json_success( __( 'Configuration Saved', 'wordlift' ) );
-	}
+        wp_send_json_success( __( 'Configuration Saved', 'wordlift' ) );
+    }
 
-	/**
-	 *
-	 * @return array
-	 */
-	private function get_params() {
+    /**
+     *
+     * @return array
+     */
+    private function get_params() {
 
-		$attachment_id = $this->may_be_get_attachment_id();
+        $attachment_id = $this->may_be_get_attachment_id();
 
-		$params = array(
-			'key'              => isset( $_POST['license'] ) ? (string) $_POST['license'] : '',
-			'vocabulary'       => isset( $_POST['vocabulary'] ) ? (string) $_POST['vocabulary'] : '',
-			'wl-site-language' => isset( $_POST['language'] ) ? (string) $_POST['language'] : '',
-			'wl-country-code'  => isset( $_POST['country'] ) ? (string) $_POST['country'] : '',
-			'name'             => isset( $_POST['publisherName'] ) ? (string) $_POST['publisherName'] : '',
-			'user_type'        => isset( $_POST['publisher'] ) ? (string) $_POST['publisher'] : '',
-			'logo'             => $attachment_id
-		);
+        $params = array(
+            'key'              => isset( $_POST['license'] ) ? (string) $_POST['license'] : '',
+            'vocabulary'       => isset( $_POST['vocabulary'] ) ? (string) $_POST['vocabulary'] : '',
+            'wl-site-language' => isset( $_POST['language'] ) ? (string) $_POST['language'] : '',
+            'wl-country-code'  => isset( $_POST['country'] ) ? (string) $_POST['country'] : '',
+            'name'             => isset( $_POST['publisherName'] ) ? (string) $_POST['publisherName'] : '',
+            'user_type'        => isset( $_POST['publisher'] ) ? (string) $_POST['publisher'] : '',
+            'logo'             => $attachment_id
+        );
 
-		$diagnostic = isset( $_POST['diagnostic'] ) ? (bool) $_POST['diagnostic'] : false;
-		if ( $diagnostic ) {
-			$params['share-diagnostic'] = 'on';
-		}
+        $diagnostic = isset( $_POST['diagnostic'] ) ? (bool) $_POST['diagnostic'] : false;
+        if ( $diagnostic ) {
+            $params['share-diagnostic'] = 'on';
+        }
 
-		return $params;
-	}
+        return $params;
+    }
 
-	/**
-	 * @return int | bool
-	 */
-	private function may_be_get_attachment_id() {
+    /**
+     * @return int | bool
+     */
+    private function may_be_get_attachment_id() {
 
-		// if image or image extension not posted then return false.
-		if ( ! isset( $_POST['image'] ) || ! isset( $_POST['imageExtension'] ) ) {
-			return false;
-		}
+        // if image or image extension not posted then return false.
+        if ( ! isset( $_POST['image'] ) || ! isset( $_POST['imageExtension'] ) ) {
+            return false;
+        }
 
-		$allowed_extensions = array( 'png', 'jpeg', 'jpg' );
-		$image_string       = (string) $_POST['image'];
-		$image_ext          = (string) $_POST['imageExtension'];
+        $allowed_extensions = array( 'png', 'jpeg', 'jpg' );
+        $image_string       = (string) $_POST['image'];
+        $image_ext          = (string) $_POST['imageExtension'];
 
-		if ( ! in_array( $image_ext, $allowed_extensions ) ) {
-			return false;
-		}
+        if ( ! in_array( $image_ext, $allowed_extensions ) ) {
+            return false;
+        }
 
-		$image_decoded_string = base64_decode( $image_string );
+        $image_decoded_string = base64_decode( $image_string );
 
-		$upload_dir = wp_upload_dir();
+        $upload_dir = wp_upload_dir();
 
-		$file_path = $upload_dir['path'] . DIRECTORY_SEPARATOR . md5( $image_string ) . "." . $image_ext;
+        $file_path = $upload_dir['path'] . DIRECTORY_SEPARATOR . md5( $image_string ) . "." . $image_ext;
 
-		file_put_contents( $file_path, $image_decoded_string );
+        file_put_contents( $file_path, $image_decoded_string );
 
-		$attachment_id = wp_insert_attachment( array(
-			'post_status'    => 'inherit',
-			'post_mime_type' => "image/$image_ext"
-		), $file_path );
+        $attachment_id = wp_insert_attachment( array(
+            'post_status'    => 'inherit',
+            'post_mime_type' => "image/$image_ext"
+        ), $file_path );
 
-		// Generate the metadata for the attachment, and update the database record.
-		$attachment_data = wp_generate_attachment_metadata( $attachment_id, $file_path );
-		// Update the attachment metadata.
-		wp_update_attachment_metadata( $attachment_id, $attachment_data );
+        // Generate the metadata for the attachment, and update the database record.
+        $attachment_data = wp_generate_attachment_metadata( $attachment_id, $file_path );
+        // Update the attachment metadata.
+        wp_update_attachment_metadata( $attachment_id, $attachment_data );
 
-		return $attachment_id;
-	}
+        return $attachment_id;
+    }
 
 }

Spacing +39 added lines, -39 removed lines

@@ -24,12 +24,12 @@ 
 	 * @param $key_validation_service \Wordlift_Key_Validation_Service
 	 * @param $configuration_service \Wordlift_Configuration_Service
 	 */
-	public function __construct( $admin_setup, $key_validation_service, $configuration_service ) {
+	public function __construct($admin_setup, $key_validation_service, $configuration_service) {
 
 		$this->admin_setup            = $admin_setup;
 		$this->key_validation_service = $key_validation_service;
 		$this->configuration_service  = $configuration_service;
-		add_action( 'wp_ajax_nopriv_wl_config_plugin', array( $this, 'config' ) );
+		add_action('wp_ajax_nopriv_wl_config_plugin', array($this, 'config'));
 
 	}
 
@@ -40,36 +40,36 @@ 
 	 *
 	 * @return bool
 	 */
-	private function is_key_valid_and_not_bound_to_any_domain( $key ) {
-		$account_info = $this->key_validation_service->get_account_info( $key );
+	private function is_key_valid_and_not_bound_to_any_domain($key) {
+		$account_info = $this->key_validation_service->get_account_info($key);
 
 		/**
 		 * we need to check if the key is not associated with any account
 		 * before setting it, we should check if the url is null.
 		 */
-		if ( is_wp_error( $account_info )
-		     || wp_remote_retrieve_response_code( $account_info ) !== 200 ) {
+		if (is_wp_error($account_info)
+		     || wp_remote_retrieve_response_code($account_info) !== 200) {
 			return false;
 		}
 
 		$account_info_json = $account_info['body'];
 
-		$account_info_data = json_decode( $account_info_json, true );
+		$account_info_data = json_decode($account_info_json, true);
 
-		if ( ! $account_info_data ) {
+		if ( ! $account_info_data) {
 			// Invalid json returned by api.
 			return false;
 		}
 
-		$site_url = apply_filters( 'wl_production_site_url', untrailingslashit( get_option( 'home' ) ) );
+		$site_url = apply_filters('wl_production_site_url', untrailingslashit(get_option('home')));
 
 
-		if ( $account_info_data['url'] === null ) {
+		if ($account_info_data['url'] === null) {
 			return true;
 		}
 
 		// Check if the key belongs to same site.
-		if ( $site_url !== untrailingslashit( $account_info_data['url'] ) ) {
+		if ($site_url !== untrailingslashit($account_info_data['url'])) {
 			// key already associated with another account.
 			return false;
 		}
@@ -92,12 +92,12 @@ 
 			'license'
 		);
 
-		header( 'Access-Control-Allow-Origin: *' );
+		header('Access-Control-Allow-Origin: *');
 
 		// validate all the fields before processing
-		foreach ( $required_fields as $field ) {
-			if ( ! array_key_exists( $field, $_POST ) ) {
-				wp_send_json_error( sprintf( __( 'Field %s is required', 'wordlift' ), $field ), 422 );
+		foreach ($required_fields as $field) {
+			if ( ! array_key_exists($field, $_POST)) {
+				wp_send_json_error(sprintf(__('Field %s is required', 'wordlift'), $field), 422);
 
 				return;
 			}
@@ -105,8 +105,8 @@ 
 
 		$key = (string) $_POST['license'];
 
-		if ( ! $this->is_key_valid_and_not_bound_to_any_domain( $key ) ) {
-			wp_send_json_error( __( 'Key is not valid or associated with other domain', 'wordlift' ), 403 );
+		if ( ! $this->is_key_valid_and_not_bound_to_any_domain($key)) {
+			wp_send_json_error(__('Key is not valid or associated with other domain', 'wordlift'), 403);
 
 			// exit if not valid.
 			return;
@@ -114,17 +114,17 @@ 
 
 
 		// check if key is already configured, if yes then dont save settings.
-		if ( $this->configuration_service->get_key() ) {
-			wp_send_json_error( __( 'Key already configured.', 'wordlift' ), 403 );
+		if ($this->configuration_service->get_key()) {
+			wp_send_json_error(__('Key already configured.', 'wordlift'), 403);
 
 			// key already configured
 			return;
 		}
 
-		$this->admin_setup->save_configuration( $this->get_params() );
+		$this->admin_setup->save_configuration($this->get_params());
 
 
-		wp_send_json_success( __( 'Configuration Saved', 'wordlift' ) );
+		wp_send_json_success(__('Configuration Saved', 'wordlift'));
 	}
 
 	/**
@@ -136,17 +136,17 @@ 
 		$attachment_id = $this->may_be_get_attachment_id();
 
 		$params = array(
-			'key'              => isset( $_POST['license'] ) ? (string) $_POST['license'] : '',
-			'vocabulary'       => isset( $_POST['vocabulary'] ) ? (string) $_POST['vocabulary'] : '',
-			'wl-site-language' => isset( $_POST['language'] ) ? (string) $_POST['language'] : '',
-			'wl-country-code'  => isset( $_POST['country'] ) ? (string) $_POST['country'] : '',
-			'name'             => isset( $_POST['publisherName'] ) ? (string) $_POST['publisherName'] : '',
-			'user_type'        => isset( $_POST['publisher'] ) ? (string) $_POST['publisher'] : '',
+			'key'              => isset($_POST['license']) ? (string) $_POST['license'] : '',
+			'vocabulary'       => isset($_POST['vocabulary']) ? (string) $_POST['vocabulary'] : '',
+			'wl-site-language' => isset($_POST['language']) ? (string) $_POST['language'] : '',
+			'wl-country-code'  => isset($_POST['country']) ? (string) $_POST['country'] : '',
+			'name'             => isset($_POST['publisherName']) ? (string) $_POST['publisherName'] : '',
+			'user_type'        => isset($_POST['publisher']) ? (string) $_POST['publisher'] : '',
 			'logo'             => $attachment_id
 		);
 
-		$diagnostic = isset( $_POST['diagnostic'] ) ? (bool) $_POST['diagnostic'] : false;
-		if ( $diagnostic ) {
+		$diagnostic = isset($_POST['diagnostic']) ? (bool) $_POST['diagnostic'] : false;
+		if ($diagnostic) {
 			$params['share-diagnostic'] = 'on';
 		}
 
@@ -159,35 +159,35 @@ 
 	private function may_be_get_attachment_id() {
 
 		// if image or image extension not posted then return false.
-		if ( ! isset( $_POST['image'] ) || ! isset( $_POST['imageExtension'] ) ) {
+		if ( ! isset($_POST['image']) || ! isset($_POST['imageExtension'])) {
 			return false;
 		}
 
-		$allowed_extensions = array( 'png', 'jpeg', 'jpg' );
+		$allowed_extensions = array('png', 'jpeg', 'jpg');
 		$image_string       = (string) $_POST['image'];
 		$image_ext          = (string) $_POST['imageExtension'];
 
-		if ( ! in_array( $image_ext, $allowed_extensions ) ) {
+		if ( ! in_array($image_ext, $allowed_extensions)) {
 			return false;
 		}
 
-		$image_decoded_string = base64_decode( $image_string );
+		$image_decoded_string = base64_decode($image_string);
 
 		$upload_dir = wp_upload_dir();
 
-		$file_path = $upload_dir['path'] . DIRECTORY_SEPARATOR . md5( $image_string ) . "." . $image_ext;
+		$file_path = $upload_dir['path'].DIRECTORY_SEPARATOR.md5($image_string).".".$image_ext;
 
-		file_put_contents( $file_path, $image_decoded_string );
+		file_put_contents($file_path, $image_decoded_string);
 
-		$attachment_id = wp_insert_attachment( array(
+		$attachment_id = wp_insert_attachment(array(
 			'post_status'    => 'inherit',
 			'post_mime_type' => "image/$image_ext"
-		), $file_path );
+		), $file_path);
 
 		// Generate the metadata for the attachment, and update the database record.
-		$attachment_data = wp_generate_attachment_metadata( $attachment_id, $file_path );
+		$attachment_data = wp_generate_attachment_metadata($attachment_id, $file_path);
 		// Update the attachment metadata.
-		wp_update_attachment_metadata( $attachment_id, $attachment_data );
+		wp_update_attachment_metadata($attachment_id, $attachment_data);
 
 		return $attachment_id;
 	}