insideout10 / wordlift-plugin

src/wordlift/common/editor/class-edit-post-loader.php

Indentation +9 added lines, -9 removed lines

@@ -10,19 +10,19 @@
  */
 abstract class Edit_Post_Loader {
 
-	public function init() {
+    public function init() {
 
-		add_action( 'admin_enqueue_scripts', array( $this, 'post_edit_screen' ) );
-	}
+        add_action( 'admin_enqueue_scripts', array( $this, 'post_edit_screen' ) );
+    }
 
-	public function post_edit_screen( $hook ) {
+    public function post_edit_screen( $hook ) {
 
-		if ( 'post.php' === $hook || 'post-new.php' === $hook ) {
-			$this->run_on_edit_post_screen();
-		}
+        if ( 'post.php' === $hook || 'post-new.php' === $hook ) {
+            $this->run_on_edit_post_screen();
+        }
 
-	}
+    }
 
-	abstract public function run_on_edit_post_screen();
+    abstract public function run_on_edit_post_screen();
 
 }

Spacing +3 added lines, -3 removed lines

@@ -12,12 +12,12 @@
 
 	public function init() {
 
-		add_action( 'admin_enqueue_scripts', array( $this, 'post_edit_screen' ) );
+		add_action('admin_enqueue_scripts', array($this, 'post_edit_screen'));
 	}
 
-	public function post_edit_screen( $hook ) {
+	public function post_edit_screen($hook) {
 
-		if ( 'post.php' === $hook || 'post-new.php' === $hook ) {
+		if ('post.php' === $hook || 'post-new.php' === $hook) {
 			$this->run_on_edit_post_screen();
 		}
 

src/wordlift/common/term-checklist/class-term-checklist.php

Indentation +24 added lines, -24 removed lines

@@ -10,36 +10,36 @@
  */
 class Term_Checklist {
 
-	/**
-	 * @param $input_name string The name of the input field assigned to checkbox.
-	 * @param $terms array<\WP_Term>
-	 * @param $selected_term_slugs array<string> The list of selected term slugs.
-	 *
-	 * @return string Html string to be rendered.
-	 */
-	public static function render( $input_name, $terms, $selected_term_slugs ) {
-
-		$terms_html = '';
-
-		$input_name = esc_html( $input_name );
-
-		foreach ( $terms as $term ) {
-
-			/**
-			 * @var $term \WP_Term
-			 */
-			$term_name   = esc_html( $term->name );
-			$checked     = in_array( $term->slug, $selected_term_slugs, true ) ? 'checked' : '';
-			$terms_html .= "<li id=\"wl_entity_type-{$term->term_id}\">
+    /**
+     * @param $input_name string The name of the input field assigned to checkbox.
+     * @param $terms array<\WP_Term>
+     * @param $selected_term_slugs array<string> The list of selected term slugs.
+     *
+     * @return string Html string to be rendered.
+     */
+    public static function render( $input_name, $terms, $selected_term_slugs ) {
+
+        $terms_html = '';
+
+        $input_name = esc_html( $input_name );
+
+        foreach ( $terms as $term ) {
+
+            /**
+             * @var $term \WP_Term
+             */
+            $term_name   = esc_html( $term->name );
+            $checked     = in_array( $term->slug, $selected_term_slugs, true ) ? 'checked' : '';
+            $terms_html .= "<li id=\"wl_entity_type-{$term->term_id}\">
 	<label class=\"selectit\">
 	<input value=\"{$term->slug}\" type=\"checkbox\" name=\"{$input_name}[]\" id=\"in-wl_entity_type-{$term->term_id}\" $checked>
 		${term_name}
 	</label>
 </li>";
 
-		}
+        }
 
-		return '<input type="text" id="wl_entity_type_search" placeholder="Search Entity Types.." /><ul id="wl-entity-type__ul">' . $terms_html . '</ul>';
-	}
+        return '<input type="text" id="wl_entity_type_search" placeholder="Search Entity Types.." /><ul id="wl-entity-type__ul">' . $terms_html . '</ul>';
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -17,19 +17,19 @@ 
 	 *
 	 * @return string Html string to be rendered.
 	 */
-	public static function render( $input_name, $terms, $selected_term_slugs ) {
+	public static function render($input_name, $terms, $selected_term_slugs) {
 
 		$terms_html = '';
 
-		$input_name = esc_html( $input_name );
+		$input_name = esc_html($input_name);
 
-		foreach ( $terms as $term ) {
+		foreach ($terms as $term) {
 
 			/**
 			 * @var $term \WP_Term
 			 */
-			$term_name   = esc_html( $term->name );
-			$checked     = in_array( $term->slug, $selected_term_slugs, true ) ? 'checked' : '';
+			$term_name   = esc_html($term->name);
+			$checked     = in_array($term->slug, $selected_term_slugs, true) ? 'checked' : '';
 			$terms_html .= "<li id=\"wl_entity_type-{$term->term_id}\">
 	<label class=\"selectit\">
 	<input value=\"{$term->slug}\" type=\"checkbox\" name=\"{$input_name}[]\" id=\"in-wl_entity_type-{$term->term_id}\" $checked>
@@ -39,7 +39,7 @@ 
 
 		}
 
-		return '<input type="text" id="wl_entity_type_search" placeholder="Search Entity Types.." /><ul id="wl-entity-type__ul">' . $terms_html . '</ul>';
+		return '<input type="text" id="wl_entity_type_search" placeholder="Search Entity Types.." /><ul id="wl-entity-type__ul">'.$terms_html.'</ul>';
 	}
 
 }

src/wordlift/common/background-process/class-background-process.php

Indentation +196 added lines, -196 removed lines

@@ -3,201 +3,201 @@
 namespace Wordlift\Common\Background_Process;
 
 abstract class Background_Process extends \Wordlift_Plugin_WP_Background_Process {
-	/**
-	 * @var \Wordlift_Log_Service
-	 */
-	private $log;
-	/**
-	 * @var Data_Source
-	 */
-	protected $data_source;
-
-	/**
-	 * Background_Process constructor.
-	 *
-	 * @param $data_source Data_Source
-	 */
-	public function __construct( $data_source ) {
-		parent::__construct();
-		$this->data_source = $data_source;
-		$this->log         = \Wordlift_Log_Service::get_logger( get_class() );
-		// Set value for action key.
-		$this->action = $this->get_action_key();
-	}
-
-	/**
-	 * The key which is used to store the Sync_State class for the current process
-	 *
-	 * @return string
-	 */
-	abstract protected function get_state_storage_key();
-
-	/**
-	 * The key which is used as prefix to store the options.
-	 *
-	 * @return string
-	 */
-	abstract protected function get_action_key();
-
-	/**
-	 * Check whether the process must cancel or not.
-	 *
-	 * @return bool Whether to cancel or not the process.
-	 */
-	private function must_cancel() {
-
-		return get_transient( "{$this->action}__cancel" );
-	}
-
-	/**
-	 * Check whether the provided state is `started` or not.
-	 *
-	 * @param Sync_State $state The {@link Sync_State}.
-	 *
-	 * @return bool True if the state is started.
-	 */
-	private function is_started( $state ) {
-		return $state instanceof Sync_State && 'started' === $state->state && 30 > ( time() - $state->last_update );
-	}
-
-	/**
-	 * Start the background processing.
-	 *
-	 * @return bool True if the process has been started, otherwise false.
-	 */
-	public function start() {
-		$action = $this->get_action_key();
-		$this->log->debug( "Trying to start  ${action}..." );
-		// Create a new Sync_Model state of `started`.
-		if ( ! $this->is_started( self::get_state() ) ) {
-			$this->log->debug( 'Starting...' );
-
-			$sync_state = new Sync_State( time(), 0, $this->data_source->count(), time(), 'started' );
-			update_option( $this->get_state_storage_key(), $sync_state, false );
-
-			$next = $this->data_source->next();
-
-			$this->push_to_queue( $next );
-			$this->save()->dispatch();
-
-			if ( $next && is_array( $next ) ) {
-				$this->log->debug( sprintf( 'Started with term IDs %s.', implode( ', ', $next ) ) );
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Cancels the current process.
-	 */
-	public function cancel() {
-
-		$action = $this->action;
-		$this->log->debug( "Cancelling ${action}..." );
-
-		// Cleanup the process data.
-		$this->cancel_process();
-
-		// Set the state to cancelled.
-		$state = $this->get_state();
-		$state->set_state( 'cancelled' );
-		update_option( $this->get_state_storage_key(), $state, false );
-
-		// Finally delete the transient.
-		delete_transient( "{$this->action}__cancel" );
-
-	}
-
-	/**
-	 * Get the sync state.
-	 *
-	 * @return Sync_State The {@link Sync_State}.
-	 */
-	public function get_state() {
-
-		try {
-			return get_option( $this->get_state_storage_key(), Sync_State::unknown() );
-		} catch ( \Exception $e ) {
-			return Sync_State::unknown();
-		}
-
-	}
-
-	/**
-	 * This function is called:
-	 *  - To start a new Synchronization, by passing a {@link Sync_Start_Message} instance.
-	 *  - To process a item, by passing a numeric ID.
-	 *
-	 * This function returns the parameter for the next call or NULL if there are no more items to process.
-	 *
-	 * @param int[] $items An array of item IDs.
-	 *
-	 * @return int[]|false The next IDs or false if there are no more.
-	 */
-	protected function task( $items ) {
-
-		// Check if we must cancel.
-		if ( $this->must_cancel() || ! $items ) {
-			$this->log->debug( 'Cancelling background process ' . $this->action . ' due to no items inside task() method' );
-			$this->cancel();
-
-			return false;
-		}
-
-		if ( $items && is_array( $items ) ) {
-			$this->log->debug( sprintf( 'Synchronizing items %s...', implode( ', ', $items ) ) );
-		}
-		// Sync the item.
-		if ( $this->process_items( $items ) ) {
-			// Update the process state, set the index in state in order
-			// to reflect the new items.
-			$this->update_batch_index();
-
-			// Get the next batch for processing.
-			return $this->get_next_batch();
-		} else {
-			// Return the failed term ids again.
-			return $items;
-		}
-	}
-
-	/**
-	 * Process all the items in the current batch.
-	 *
-	 * @param $items
-	 *
-	 * @return bool If all items are successfully processed.
-	 */
-	abstract protected function process_items( $items );
-
-	/**
-	 * Return next batch of items after processing.
-	 *
-	 * @return int[] or false
-	 */
-	protected function get_next_batch() {
-		return $this->data_source->next();
-	}
-
-	private function update_batch_index() {
-		$next = $this->data_source->next();
-
-		$next_state = isset( $next ) ? 'started' : 'ended';
-
-		/**
-		 * Update the synchronization meta data, by increasing the current index.
-		 *
-		 * @var Sync_State $sync The {@link Sync_State}.
-		 */
-		$state = self::get_state()
-					 ->increment_index( $this->data_source->get_batch_size() )
-					 ->set_state( $next_state );
-
-		update_option( $this->get_state_storage_key(), $state, false );
-
-	}
+    /**
+     * @var \Wordlift_Log_Service
+     */
+    private $log;
+    /**
+     * @var Data_Source
+     */
+    protected $data_source;
+
+    /**
+     * Background_Process constructor.
+     *
+     * @param $data_source Data_Source
+     */
+    public function __construct( $data_source ) {
+        parent::__construct();
+        $this->data_source = $data_source;
+        $this->log         = \Wordlift_Log_Service::get_logger( get_class() );
+        // Set value for action key.
+        $this->action = $this->get_action_key();
+    }
+
+    /**
+     * The key which is used to store the Sync_State class for the current process
+     *
+     * @return string
+     */
+    abstract protected function get_state_storage_key();
+
+    /**
+     * The key which is used as prefix to store the options.
+     *
+     * @return string
+     */
+    abstract protected function get_action_key();
+
+    /**
+     * Check whether the process must cancel or not.
+     *
+     * @return bool Whether to cancel or not the process.
+     */
+    private function must_cancel() {
+
+        return get_transient( "{$this->action}__cancel" );
+    }
+
+    /**
+     * Check whether the provided state is `started` or not.
+     *
+     * @param Sync_State $state The {@link Sync_State}.
+     *
+     * @return bool True if the state is started.
+     */
+    private function is_started( $state ) {
+        return $state instanceof Sync_State && 'started' === $state->state && 30 > ( time() - $state->last_update );
+    }
+
+    /**
+     * Start the background processing.
+     *
+     * @return bool True if the process has been started, otherwise false.
+     */
+    public function start() {
+        $action = $this->get_action_key();
+        $this->log->debug( "Trying to start  ${action}..." );
+        // Create a new Sync_Model state of `started`.
+        if ( ! $this->is_started( self::get_state() ) ) {
+            $this->log->debug( 'Starting...' );
+
+            $sync_state = new Sync_State( time(), 0, $this->data_source->count(), time(), 'started' );
+            update_option( $this->get_state_storage_key(), $sync_state, false );
+
+            $next = $this->data_source->next();
+
+            $this->push_to_queue( $next );
+            $this->save()->dispatch();
+
+            if ( $next && is_array( $next ) ) {
+                $this->log->debug( sprintf( 'Started with term IDs %s.', implode( ', ', $next ) ) );
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Cancels the current process.
+     */
+    public function cancel() {
+
+        $action = $this->action;
+        $this->log->debug( "Cancelling ${action}..." );
+
+        // Cleanup the process data.
+        $this->cancel_process();
+
+        // Set the state to cancelled.
+        $state = $this->get_state();
+        $state->set_state( 'cancelled' );
+        update_option( $this->get_state_storage_key(), $state, false );
+
+        // Finally delete the transient.
+        delete_transient( "{$this->action}__cancel" );
+
+    }
+
+    /**
+     * Get the sync state.
+     *
+     * @return Sync_State The {@link Sync_State}.
+     */
+    public function get_state() {
+
+        try {
+            return get_option( $this->get_state_storage_key(), Sync_State::unknown() );
+        } catch ( \Exception $e ) {
+            return Sync_State::unknown();
+        }
+
+    }
+
+    /**
+     * This function is called:
+     *  - To start a new Synchronization, by passing a {@link Sync_Start_Message} instance.
+     *  - To process a item, by passing a numeric ID.
+     *
+     * This function returns the parameter for the next call or NULL if there are no more items to process.
+     *
+     * @param int[] $items An array of item IDs.
+     *
+     * @return int[]|false The next IDs or false if there are no more.
+     */
+    protected function task( $items ) {
+
+        // Check if we must cancel.
+        if ( $this->must_cancel() || ! $items ) {
+            $this->log->debug( 'Cancelling background process ' . $this->action . ' due to no items inside task() method' );
+            $this->cancel();
+
+            return false;
+        }
+
+        if ( $items && is_array( $items ) ) {
+            $this->log->debug( sprintf( 'Synchronizing items %s...', implode( ', ', $items ) ) );
+        }
+        // Sync the item.
+        if ( $this->process_items( $items ) ) {
+            // Update the process state, set the index in state in order
+            // to reflect the new items.
+            $this->update_batch_index();
+
+            // Get the next batch for processing.
+            return $this->get_next_batch();
+        } else {
+            // Return the failed term ids again.
+            return $items;
+        }
+    }
+
+    /**
+     * Process all the items in the current batch.
+     *
+     * @param $items
+     *
+     * @return bool If all items are successfully processed.
+     */
+    abstract protected function process_items( $items );
+
+    /**
+     * Return next batch of items after processing.
+     *
+     * @return int[] or false
+     */
+    protected function get_next_batch() {
+        return $this->data_source->next();
+    }
+
+    private function update_batch_index() {
+        $next = $this->data_source->next();
+
+        $next_state = isset( $next ) ? 'started' : 'ended';
+
+        /**
+         * Update the synchronization meta data, by increasing the current index.
+         *
+         * @var Sync_State $sync The {@link Sync_State}.
+         */
+        $state = self::get_state()
+                        ->increment_index( $this->data_source->get_batch_size() )
+                        ->set_state( $next_state );
+
+        update_option( $this->get_state_storage_key(), $state, false );
+
+    }
 
 }

Spacing +30 added lines, -30 removed lines

@@ -17,10 +17,10 @@ 
 	 *
 	 * @param $data_source Data_Source
 	 */
-	public function __construct( $data_source ) {
+	public function __construct($data_source) {
 		parent::__construct();
 		$this->data_source = $data_source;
-		$this->log         = \Wordlift_Log_Service::get_logger( get_class() );
+		$this->log         = \Wordlift_Log_Service::get_logger(get_class());
 		// Set value for action key.
 		$this->action = $this->get_action_key();
 	}
@@ -46,7 +46,7 @@ 
 	 */
 	private function must_cancel() {
 
-		return get_transient( "{$this->action}__cancel" );
+		return get_transient("{$this->action}__cancel");
 	}
 
 	/**
@@ -56,8 +56,8 @@ 
 	 *
 	 * @return bool True if the state is started.
 	 */
-	private function is_started( $state ) {
-		return $state instanceof Sync_State && 'started' === $state->state && 30 > ( time() - $state->last_update );
+	private function is_started($state) {
+		return $state instanceof Sync_State && 'started' === $state->state && 30 > (time() - $state->last_update);
 	}
 
 	/**
@@ -67,21 +67,21 @@ 
 	 */
 	public function start() {
 		$action = $this->get_action_key();
-		$this->log->debug( "Trying to start  ${action}..." );
+		$this->log->debug("Trying to start  ${action}...");
 		// Create a new Sync_Model state of `started`.
-		if ( ! $this->is_started( self::get_state() ) ) {
-			$this->log->debug( 'Starting...' );
+		if ( ! $this->is_started(self::get_state())) {
+			$this->log->debug('Starting...');
 
-			$sync_state = new Sync_State( time(), 0, $this->data_source->count(), time(), 'started' );
-			update_option( $this->get_state_storage_key(), $sync_state, false );
+			$sync_state = new Sync_State(time(), 0, $this->data_source->count(), time(), 'started');
+			update_option($this->get_state_storage_key(), $sync_state, false);
 
 			$next = $this->data_source->next();
 
-			$this->push_to_queue( $next );
+			$this->push_to_queue($next);
 			$this->save()->dispatch();
 
-			if ( $next && is_array( $next ) ) {
-				$this->log->debug( sprintf( 'Started with term IDs %s.', implode( ', ', $next ) ) );
+			if ($next && is_array($next)) {
+				$this->log->debug(sprintf('Started with term IDs %s.', implode(', ', $next)));
 			}
 
 			return true;
@@ -96,18 +96,18 @@ 
 	public function cancel() {
 
 		$action = $this->action;
-		$this->log->debug( "Cancelling ${action}..." );
+		$this->log->debug("Cancelling ${action}...");
 
 		// Cleanup the process data.
 		$this->cancel_process();
 
 		// Set the state to cancelled.
 		$state = $this->get_state();
-		$state->set_state( 'cancelled' );
-		update_option( $this->get_state_storage_key(), $state, false );
+		$state->set_state('cancelled');
+		update_option($this->get_state_storage_key(), $state, false);
 
 		// Finally delete the transient.
-		delete_transient( "{$this->action}__cancel" );
+		delete_transient("{$this->action}__cancel");
 
 	}
 
@@ -119,8 +119,8 @@ 
 	public function get_state() {
 
 		try {
-			return get_option( $this->get_state_storage_key(), Sync_State::unknown() );
-		} catch ( \Exception $e ) {
+			return get_option($this->get_state_storage_key(), Sync_State::unknown());
+		} catch (\Exception $e) {
 			return Sync_State::unknown();
 		}
 
@@ -137,21 +137,21 @@ 
 	 *
 	 * @return int[]|false The next IDs or false if there are no more.
 	 */
-	protected function task( $items ) {
+	protected function task($items) {
 
 		// Check if we must cancel.
-		if ( $this->must_cancel() || ! $items ) {
-			$this->log->debug( 'Cancelling background process ' . $this->action . ' due to no items inside task() method' );
+		if ($this->must_cancel() || ! $items) {
+			$this->log->debug('Cancelling background process '.$this->action.' due to no items inside task() method');
 			$this->cancel();
 
 			return false;
 		}
 
-		if ( $items && is_array( $items ) ) {
-			$this->log->debug( sprintf( 'Synchronizing items %s...', implode( ', ', $items ) ) );
+		if ($items && is_array($items)) {
+			$this->log->debug(sprintf('Synchronizing items %s...', implode(', ', $items)));
 		}
 		// Sync the item.
-		if ( $this->process_items( $items ) ) {
+		if ($this->process_items($items)) {
 			// Update the process state, set the index in state in order
 			// to reflect the new items.
 			$this->update_batch_index();
@@ -171,7 +171,7 @@ 
 	 *
 	 * @return bool If all items are successfully processed.
 	 */
-	abstract protected function process_items( $items );
+	abstract protected function process_items($items);
 
 	/**
 	 * Return next batch of items after processing.
@@ -185,7 +185,7 @@ 
 	private function update_batch_index() {
 		$next = $this->data_source->next();
 
-		$next_state = isset( $next ) ? 'started' : 'ended';
+		$next_state = isset($next) ? 'started' : 'ended';
 
 		/**
 		 * Update the synchronization meta data, by increasing the current index.
@@ -193,10 +193,10 @@ 
 		 * @var Sync_State $sync The {@link Sync_State}.
 		 */
 		$state = self::get_state()
-					 ->increment_index( $this->data_source->get_batch_size() )
-					 ->set_state( $next_state );
+					 ->increment_index($this->data_source->get_batch_size())
+					 ->set_state($next_state);
 
-		update_option( $this->get_state_storage_key(), $state, false );
+		update_option($this->get_state_storage_key(), $state, false);
 
 	}
 

src/wordlift/common/loader/class-loader.php

Indentation +6 added lines, -6 removed lines

@@ -9,11 +9,11 @@
 
 interface Loader {
 
-	/**
-	 * The loader should register the feature to feature registry.
-	 *
-	 * @return void
-	 */
-	public function init_feature();
+    /**
+     * The loader should register the feature to feature registry.
+     *
+     * @return void
+     */
+    public function init_feature();
 
 }

src/wordlift-editor.php

Indentation +25 added lines, -25 removed lines

@@ -9,32 +9,32 @@ 
  */
 function wordlift_mce_css( $mce_css ) {
 
-	/*
+    /*
 	 * Call the `wl_can_see_classification_box` filter to determine whether we can display the classification box.
 	 *
 	 * @since 3.20.3
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/914
 	 */
-	if ( ! apply_filters( 'wl_can_see_classification_box', true ) ) {
-		return $mce_css;
-	}
-
-	if ( ! empty( $mce_css ) ) {
-		$mce_css .= ',';
-	}
-
-	/**
-	 * Replacing the legacy `wordlift-reloaded.min.css` with tiny-mce.css.
-	 *
-	 * tiny-mce.css is generated using the new webpack project and its rules are shared with Gutenberg.
-	 *
-	 * @author David Riccitelli <david@wordlift.io>
-	 * @since 3.23.0
-	 */
-	$mce_css .= plugin_dir_url( __FILE__ ) . 'js/dist/tiny-mce.css';
-
-	return $mce_css;
+    if ( ! apply_filters( 'wl_can_see_classification_box', true ) ) {
+        return $mce_css;
+    }
+
+    if ( ! empty( $mce_css ) ) {
+        $mce_css .= ',';
+    }
+
+    /**
+     * Replacing the legacy `wordlift-reloaded.min.css` with tiny-mce.css.
+     *
+     * tiny-mce.css is generated using the new webpack project and its rules are shared with Gutenberg.
+     *
+     * @author David Riccitelli <david@wordlift.io>
+     * @since 3.23.0
+     */
+    $mce_css .= plugin_dir_url( __FILE__ ) . 'js/dist/tiny-mce.css';
+
+    return $mce_css;
 }
 
 // hook the TinyMCE custom styles function.
@@ -49,13 +49,13 @@ 
  */
 function wordlift_filter_tiny_mce_before_init( $options ) {
 
-	if ( ! isset( $options['extended_valid_elements'] ) ) {
-		$options['extended_valid_elements'] = '';
-	}
+    if ( ! isset( $options['extended_valid_elements'] ) ) {
+        $options['extended_valid_elements'] = '';
+    }
 
-	$options['extended_valid_elements'] .= ',span[*]';
+    $options['extended_valid_elements'] .= ',span[*]';
 
-	return $options;
+    return $options;
 }
 
 add_filter( 'tiny_mce_before_init', 'wordlift_filter_tiny_mce_before_init', PHP_INT_MAX );

Spacing +8 added lines, -8 removed lines

@@ -7,7 +7,7 @@ 
  *
  * @return string The updated list of styles, including the custom style provided by WordLift.
  */
-function wordlift_mce_css( $mce_css ) {
+function wordlift_mce_css($mce_css) {
 
 	/*
 	 * Call the `wl_can_see_classification_box` filter to determine whether we can display the classification box.
@@ -16,11 +16,11 @@ 
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/914
 	 */
-	if ( ! apply_filters( 'wl_can_see_classification_box', true ) ) {
+	if ( ! apply_filters('wl_can_see_classification_box', true)) {
 		return $mce_css;
 	}
 
-	if ( ! empty( $mce_css ) ) {
+	if ( ! empty($mce_css)) {
 		$mce_css .= ',';
 	}
 
@@ -32,13 +32,13 @@ 
 	 * @author David Riccitelli <david@wordlift.io>
 	 * @since 3.23.0
 	 */
-	$mce_css .= plugin_dir_url( __FILE__ ) . 'js/dist/tiny-mce.css';
+	$mce_css .= plugin_dir_url(__FILE__).'js/dist/tiny-mce.css';
 
 	return $mce_css;
 }
 
 // hook the TinyMCE custom styles function.
-add_filter( 'mce_css', 'wordlift_mce_css' );
+add_filter('mce_css', 'wordlift_mce_css');
 
 /**
  * Set TinyMCE options, in particular enable microdata tagging.
@@ -47,9 +47,9 @@ 
  *
  * @return mixed
  */
-function wordlift_filter_tiny_mce_before_init( $options ) {
+function wordlift_filter_tiny_mce_before_init($options) {
 
-	if ( ! isset( $options['extended_valid_elements'] ) ) {
+	if ( ! isset($options['extended_valid_elements'])) {
 		$options['extended_valid_elements'] = '';
 	}
 
@@ -58,4 +58,4 @@ 
 	return $options;
 }
 
-add_filter( 'tiny_mce_before_init', 'wordlift_filter_tiny_mce_before_init', PHP_INT_MAX );
+add_filter('tiny_mce_before_init', 'wordlift_filter_tiny_mce_before_init', PHP_INT_MAX);

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

Indentation +60 added lines, -60 removed lines

@@ -21,76 +21,76 @@
  */
 class Wordlift_AMP_Service {
 
-	/**
-	 * The {@link \Wordlift_Jsonld_Service} instance.
-	 *
-	 * @since 3.19.1
-	 * @access private
-	 * @var \Wordlift_Jsonld_Service $jsonld_service The {@link \Wordlift_Jsonld_Service} instance.
-	 */
-	private $jsonld_service;
+    /**
+     * The {@link \Wordlift_Jsonld_Service} instance.
+     *
+     * @since 3.19.1
+     * @access private
+     * @var \Wordlift_Jsonld_Service $jsonld_service The {@link \Wordlift_Jsonld_Service} instance.
+     */
+    private $jsonld_service;
 
-	/**
-	 * Create a {@link Wordlift_AMP_Service} instance.
-	 *
-	 * @since 3.19.1
-	 *
-	 * @param \Wordlift_Jsonld_Service $jsonld_service
-	 */
-	public function __construct( $jsonld_service ) {
+    /**
+     * Create a {@link Wordlift_AMP_Service} instance.
+     *
+     * @since 3.19.1
+     *
+     * @param \Wordlift_Jsonld_Service $jsonld_service
+     */
+    public function __construct( $jsonld_service ) {
 
-		$this->jsonld_service = $jsonld_service;
+        $this->jsonld_service = $jsonld_service;
 
-		add_action( 'amp_init', array( $this, 'register_entity_cpt_with_amp_plugin' ) );
-		add_filter( 'amp_post_template_metadata', array( $this, 'amp_post_template_metadata' ), 99, 2 );
+        add_action( 'amp_init', array( $this, 'register_entity_cpt_with_amp_plugin' ) );
+        add_filter( 'amp_post_template_metadata', array( $this, 'amp_post_template_metadata' ), 99, 2 );
 
-	}
+    }
 
-	/**
-	 * Register the `entity` post type with the AMP plugin.
-	 *
-	 * @since 3.12.0
-	 */
-	public function register_entity_cpt_with_amp_plugin() {
+    /**
+     * Register the `entity` post type with the AMP plugin.
+     *
+     * @since 3.12.0
+     */
+    public function register_entity_cpt_with_amp_plugin() {
 
-		if ( ! defined( 'AMP_QUERY_VAR' ) ) {
-			return;
-		}
+        if ( ! defined( 'AMP_QUERY_VAR' ) ) {
+            return;
+        }
 
-		foreach ( Wordlift_Entity_Service::valid_entity_post_types() as $post_type ) {
-			// Do not change anything for posts and pages.
-			if ( 'post' === $post_type || 'page' === $post_type ) {
-				continue;
-			}
-			add_post_type_support( $post_type, AMP_QUERY_VAR );
-		}
+        foreach ( Wordlift_Entity_Service::valid_entity_post_types() as $post_type ) {
+            // Do not change anything for posts and pages.
+            if ( 'post' === $post_type || 'page' === $post_type ) {
+                continue;
+            }
+            add_post_type_support( $post_type, AMP_QUERY_VAR );
+        }
 
-	}
+    }
 
-	/**
-	 * Filters Schema.org metadata for a post.
-	 *
-	 * @since 3.19.1
-	 *
-	 * @param array   $metadata Metadata.
-	 * @param WP_Post $post Post.
-	 *
-	 * @return array Return WordLift's generated JSON-LD.
-	 */
-	public function amp_post_template_metadata( $metadata, $post ) {
+    /**
+     * Filters Schema.org metadata for a post.
+     *
+     * @since 3.19.1
+     *
+     * @param array   $metadata Metadata.
+     * @param WP_Post $post Post.
+     *
+     * @return array Return WordLift's generated JSON-LD.
+     */
+    public function amp_post_template_metadata( $metadata, $post ) {
 
-		return $this->jsonld_service->get_jsonld( false, $post->ID );
-	}
+        return $this->jsonld_service->get_jsonld( false, $post->ID );
+    }
 
-	/**
-	 * Check if current page is amp endpoint.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @return bool
-	 */
-	public static function is_amp_endpoint() {
-		return function_exists( 'is_amp_endpoint' ) && is_amp_endpoint();
-	}
+    /**
+     * Check if current page is amp endpoint.
+     *
+     * @since 3.20.0
+     *
+     * @return bool
+     */
+    public static function is_amp_endpoint() {
+        return function_exists( 'is_amp_endpoint' ) && is_amp_endpoint();
+    }
 
 }

Spacing +10 added lines, -10 removed lines

@@ -37,12 +37,12 @@ 
 	 *
 	 * @param \Wordlift_Jsonld_Service $jsonld_service
 	 */
-	public function __construct( $jsonld_service ) {
+	public function __construct($jsonld_service) {
 
 		$this->jsonld_service = $jsonld_service;
 
-		add_action( 'amp_init', array( $this, 'register_entity_cpt_with_amp_plugin' ) );
-		add_filter( 'amp_post_template_metadata', array( $this, 'amp_post_template_metadata' ), 99, 2 );
+		add_action('amp_init', array($this, 'register_entity_cpt_with_amp_plugin'));
+		add_filter('amp_post_template_metadata', array($this, 'amp_post_template_metadata'), 99, 2);
 
 	}
 
@@ -53,16 +53,16 @@ 
 	 */
 	public function register_entity_cpt_with_amp_plugin() {
 
-		if ( ! defined( 'AMP_QUERY_VAR' ) ) {
+		if ( ! defined('AMP_QUERY_VAR')) {
 			return;
 		}
 
-		foreach ( Wordlift_Entity_Service::valid_entity_post_types() as $post_type ) {
+		foreach (Wordlift_Entity_Service::valid_entity_post_types() as $post_type) {
 			// Do not change anything for posts and pages.
-			if ( 'post' === $post_type || 'page' === $post_type ) {
+			if ('post' === $post_type || 'page' === $post_type) {
 				continue;
 			}
-			add_post_type_support( $post_type, AMP_QUERY_VAR );
+			add_post_type_support($post_type, AMP_QUERY_VAR);
 		}
 
 	}
@@ -77,9 +77,9 @@ 
 	 *
 	 * @return array Return WordLift's generated JSON-LD.
 	 */
-	public function amp_post_template_metadata( $metadata, $post ) {
+	public function amp_post_template_metadata($metadata, $post) {
 
-		return $this->jsonld_service->get_jsonld( false, $post->ID );
+		return $this->jsonld_service->get_jsonld(false, $post->ID);
 	}
 
 	/**
@@ -90,7 +90,7 @@ 
 	 * @return bool
 	 */
 	public static function is_amp_endpoint() {
-		return function_exists( 'is_amp_endpoint' ) && is_amp_endpoint();
+		return function_exists('is_amp_endpoint') && is_amp_endpoint();
 	}
 
 }

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

Indentation +111 added lines, -111 removed lines

@@ -17,116 +17,116 @@
  */
 class Wordlift_ShareThis_Service {
 
-	/**
-	 * The ShareThis function which prints the buttons.
-	 *
-	 * @since 3.2.0
-	 */
-	const ADD_WIDGET_FUNCTION_NAME = 'st_add_widget';
-
-	/**
-	 * The Log service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log_service The Log service.
-	 */
-	private $log_service;
-
-	/**
-	 * Create an instance of the ShareThis service.
-	 *
-	 * @since 3.2.0
-	 */
-	public function __construct() {
-
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_ShareThis_Service' );
-
-	}
-
-	/**
-	 * Receive <em>the_content</em> filter calls from WordPress.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param string $content The post content.
-	 *
-	 * @return string The updated post content.
-	 */
-	public function the_content( $content ) {
-
-		return $this->call_sharethis( 'the_content', $content );
-	}
-
-	/**
-	 * Receive <em>the_excerpt</em> filter calls from WordPress.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param string $content The post excerpt.
-	 *
-	 * @return string The updated post excerpt.
-	 */
-	public function the_excerpt( $content ) {
-
-		return $this->call_sharethis( 'the_excerpt', $content );
-	}
-
-	/**
-	 * Call the ShareThis function.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param string $tag The filter tag.
-	 * @param string $content The post content.
-	 *
-	 * @return string The updated post content.
-	 */
-	private function call_sharethis( $tag, $content ) {
-
-		// Get the current post.
-		global $post;
-
-		// Bail out if the global $post instance isn't set.
-		if ( ! isset( $post ) ) {
-			return $content;
-		}
-
-		// Bail out if the current entity is a post/page since this is already handled by ShareThis.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/819
-		if ( 'post' === $post->post_type || 'page' === $post->post_type ) {
-			return $content;
-		}
-
-		// If it's not the entity type, return.
-		$entity_service = Wordlift_Entity_Service::get_instance();
-		if ( null === $post || ! $entity_service->is_entity( get_the_ID() ) ) {
-			return $content;
-		}
-
-		// If the ShareThis function doesn't exist, return.
-		if ( ! function_exists( self::ADD_WIDGET_FUNCTION_NAME ) ) {
-			return $content;
-		}
-
-		// If ShareThis hasn't been added as a filter, return.
-		if ( ! has_filter( $tag, self::ADD_WIDGET_FUNCTION_NAME ) ) {
-			return $content;
-		}
-
-		// Temporary pop the post type and replace it with post.
-		$post_type       = $post->post_type;
-		$post->post_type = 'post';
-
-		// Call ShareThis (disguised as a post).
-		$content = call_user_func_array( self::ADD_WIDGET_FUNCTION_NAME, array( $content ) );
-
-		// Restore our post type.
-		$post->post_type = $post_type;
-
-		// Finally return the content.
-		return $content;
-	}
+    /**
+     * The ShareThis function which prints the buttons.
+     *
+     * @since 3.2.0
+     */
+    const ADD_WIDGET_FUNCTION_NAME = 'st_add_widget';
+
+    /**
+     * The Log service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_Log_Service $log_service The Log service.
+     */
+    private $log_service;
+
+    /**
+     * Create an instance of the ShareThis service.
+     *
+     * @since 3.2.0
+     */
+    public function __construct() {
+
+        $this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_ShareThis_Service' );
+
+    }
+
+    /**
+     * Receive <em>the_content</em> filter calls from WordPress.
+     *
+     * @since 3.2.0
+     *
+     * @param string $content The post content.
+     *
+     * @return string The updated post content.
+     */
+    public function the_content( $content ) {
+
+        return $this->call_sharethis( 'the_content', $content );
+    }
+
+    /**
+     * Receive <em>the_excerpt</em> filter calls from WordPress.
+     *
+     * @since 3.2.0
+     *
+     * @param string $content The post excerpt.
+     *
+     * @return string The updated post excerpt.
+     */
+    public function the_excerpt( $content ) {
+
+        return $this->call_sharethis( 'the_excerpt', $content );
+    }
+
+    /**
+     * Call the ShareThis function.
+     *
+     * @since 3.2.0
+     *
+     * @param string $tag The filter tag.
+     * @param string $content The post content.
+     *
+     * @return string The updated post content.
+     */
+    private function call_sharethis( $tag, $content ) {
+
+        // Get the current post.
+        global $post;
+
+        // Bail out if the global $post instance isn't set.
+        if ( ! isset( $post ) ) {
+            return $content;
+        }
+
+        // Bail out if the current entity is a post/page since this is already handled by ShareThis.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/819
+        if ( 'post' === $post->post_type || 'page' === $post->post_type ) {
+            return $content;
+        }
+
+        // If it's not the entity type, return.
+        $entity_service = Wordlift_Entity_Service::get_instance();
+        if ( null === $post || ! $entity_service->is_entity( get_the_ID() ) ) {
+            return $content;
+        }
+
+        // If the ShareThis function doesn't exist, return.
+        if ( ! function_exists( self::ADD_WIDGET_FUNCTION_NAME ) ) {
+            return $content;
+        }
+
+        // If ShareThis hasn't been added as a filter, return.
+        if ( ! has_filter( $tag, self::ADD_WIDGET_FUNCTION_NAME ) ) {
+            return $content;
+        }
+
+        // Temporary pop the post type and replace it with post.
+        $post_type       = $post->post_type;
+        $post->post_type = 'post';
+
+        // Call ShareThis (disguised as a post).
+        $content = call_user_func_array( self::ADD_WIDGET_FUNCTION_NAME, array( $content ) );
+
+        // Restore our post type.
+        $post->post_type = $post_type;
+
+        // Finally return the content.
+        return $content;
+    }
 
 }

Spacing +12 added lines, -12 removed lines

@@ -40,7 +40,7 @@ 
 	 */
 	public function __construct() {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_ShareThis_Service' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_ShareThis_Service');
 
 	}
 
@@ -53,9 +53,9 @@ 
 	 *
 	 * @return string The updated post content.
 	 */
-	public function the_content( $content ) {
+	public function the_content($content) {
 
-		return $this->call_sharethis( 'the_content', $content );
+		return $this->call_sharethis('the_content', $content);
 	}
 
 	/**
@@ -67,9 +67,9 @@ 
 	 *
 	 * @return string The updated post excerpt.
 	 */
-	public function the_excerpt( $content ) {
+	public function the_excerpt($content) {
 
-		return $this->call_sharethis( 'the_excerpt', $content );
+		return $this->call_sharethis('the_excerpt', $content);
 	}
 
 	/**
@@ -82,36 +82,36 @@ 
 	 *
 	 * @return string The updated post content.
 	 */
-	private function call_sharethis( $tag, $content ) {
+	private function call_sharethis($tag, $content) {
 
 		// Get the current post.
 		global $post;
 
 		// Bail out if the global $post instance isn't set.
-		if ( ! isset( $post ) ) {
+		if ( ! isset($post)) {
 			return $content;
 		}
 
 		// Bail out if the current entity is a post/page since this is already handled by ShareThis.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/819
-		if ( 'post' === $post->post_type || 'page' === $post->post_type ) {
+		if ('post' === $post->post_type || 'page' === $post->post_type) {
 			return $content;
 		}
 
 		// If it's not the entity type, return.
 		$entity_service = Wordlift_Entity_Service::get_instance();
-		if ( null === $post || ! $entity_service->is_entity( get_the_ID() ) ) {
+		if (null === $post || ! $entity_service->is_entity(get_the_ID())) {
 			return $content;
 		}
 
 		// If the ShareThis function doesn't exist, return.
-		if ( ! function_exists( self::ADD_WIDGET_FUNCTION_NAME ) ) {
+		if ( ! function_exists(self::ADD_WIDGET_FUNCTION_NAME)) {
 			return $content;
 		}
 
 		// If ShareThis hasn't been added as a filter, return.
-		if ( ! has_filter( $tag, self::ADD_WIDGET_FUNCTION_NAME ) ) {
+		if ( ! has_filter($tag, self::ADD_WIDGET_FUNCTION_NAME)) {
 			return $content;
 		}
 
@@ -120,7 +120,7 @@ 
 		$post->post_type = 'post';
 
 		// Call ShareThis (disguised as a post).
-		$content = call_user_func_array( self::ADD_WIDGET_FUNCTION_NAME, array( $content ) );
+		$content = call_user_func_array(self::ADD_WIDGET_FUNCTION_NAME, array($content));
 
 		// Restore our post type.
 		$post->post_type = $post_type;

src/public/class-wordlift-public.php

Indentation +218 added lines, -218 removed lines

@@ -22,106 +22,106 @@ 
  */
 class Wordlift_Public {
 
-	/**
-	 * The ID of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $plugin_name The ID of this plugin.
-	 */
-	private $plugin_name;
-
-	/**
-	 * The version of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $version The current version of this plugin.
-	 */
-	private $version;
-
-	/**
-	 * Initialize the class and set its properties.
-	 *
-	 * @param string $plugin_name The name of the plugin.
-	 * @param string $version The version of this plugin.
-	 *
-	 * @since    1.0.0
-	 */
-	public function __construct( $plugin_name, $version ) {
-
-		$this->plugin_name = $plugin_name;
-		$this->version     = $version;
-
-	}
-
-	/**
-	 * Register the stylesheets for the public-facing side of the site.
-	 *
-	 * @since 3.19.3 Register the `wordlift-ui` css.
-	 * @since 3.19.2 The call to this function is commented out in `class-wordlift.php` because `wordlift-public.css`
-	 *               is empty.
-	 * @since 1.0.0
-	 */
-	public function enqueue_styles() {
-
-		/**
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		/**
-		 * Add the `wordlift-font-awesome` unless some 3rd party sets the flag to false.
-		 *
-		 * @param bool $include Whether to include or not font-awesome (default true).
-		 *
-		 * @since 3.19.3
-		 */
-		$deps = apply_filters( 'wl_include_font_awesome', true )
-			? array( 'wordlift-font-awesome' )
-			: array();
-		wp_register_style( 'wordlift-font-awesome', plugin_dir_url( __DIR__ ) . 'css/wordlift-font-awesome' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', array(), $this->version, 'all' );
-		wp_register_style( 'wordlift-ui', plugin_dir_url( __DIR__ ) . 'css/wordlift-ui' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', $deps, $this->version, 'all' );
-
-		// You need to re-enable the enqueue_styles in `class-wordlift.php` to make this effective.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/821
-		//
-		// wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-public.css', array(), $this->version, 'all' );
-	}
-
-	/**
-	 * Register the stylesheets for the public-facing side of the site.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_scripts() {
-
-		/**
-		 * This function is provided for demonstration purposes only.
-		 *
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		$settings = self::get_settings();
-
-		// Note that we switched the js to be loaded in footer, since it is loading
-		// the json-ld representation.
-		wp_enqueue_script( $this->plugin_name, self::get_public_js_url(), array(), $this->version, true );
-		wp_localize_script( $this->plugin_name, 'wlSettings', $settings );
-
-		/*
+    /**
+     * The ID of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $plugin_name The ID of this plugin.
+     */
+    private $plugin_name;
+
+    /**
+     * The version of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $version The current version of this plugin.
+     */
+    private $version;
+
+    /**
+     * Initialize the class and set its properties.
+     *
+     * @param string $plugin_name The name of the plugin.
+     * @param string $version The version of this plugin.
+     *
+     * @since    1.0.0
+     */
+    public function __construct( $plugin_name, $version ) {
+
+        $this->plugin_name = $plugin_name;
+        $this->version     = $version;
+
+    }
+
+    /**
+     * Register the stylesheets for the public-facing side of the site.
+     *
+     * @since 3.19.3 Register the `wordlift-ui` css.
+     * @since 3.19.2 The call to this function is commented out in `class-wordlift.php` because `wordlift-public.css`
+     *               is empty.
+     * @since 1.0.0
+     */
+    public function enqueue_styles() {
+
+        /**
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        /**
+         * Add the `wordlift-font-awesome` unless some 3rd party sets the flag to false.
+         *
+         * @param bool $include Whether to include or not font-awesome (default true).
+         *
+         * @since 3.19.3
+         */
+        $deps = apply_filters( 'wl_include_font_awesome', true )
+            ? array( 'wordlift-font-awesome' )
+            : array();
+        wp_register_style( 'wordlift-font-awesome', plugin_dir_url( __DIR__ ) . 'css/wordlift-font-awesome' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', array(), $this->version, 'all' );
+        wp_register_style( 'wordlift-ui', plugin_dir_url( __DIR__ ) . 'css/wordlift-ui' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', $deps, $this->version, 'all' );
+
+        // You need to re-enable the enqueue_styles in `class-wordlift.php` to make this effective.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/821
+        //
+        // wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-public.css', array(), $this->version, 'all' );
+    }
+
+    /**
+     * Register the stylesheets for the public-facing side of the site.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_scripts() {
+
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        $settings = self::get_settings();
+
+        // Note that we switched the js to be loaded in footer, since it is loading
+        // the json-ld representation.
+        wp_enqueue_script( $this->plugin_name, self::get_public_js_url(), array(), $this->version, true );
+        wp_localize_script( $this->plugin_name, 'wlSettings', $settings );
+
+        /*
 		 * Add WordLift's version.
 		 * Can be disabled via filter 'wl_disable_version_js' since 3.21.1
 		 *
@@ -130,133 +130,133 @@ 
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/843.
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/926.
 		 */
-		$show_version_default = false;
-		$show_version         = apply_filters( 'wl_disable_version_js', $show_version_default );
-
-		if ( $show_version ) {
-			wp_localize_script(
-				$this->plugin_name,
-				'wordlift',
-				array(
-					'version' => $this->version,
-				)
-			);
-		}
-
-		/*
+        $show_version_default = false;
+        $show_version         = apply_filters( 'wl_disable_version_js', $show_version_default );
+
+        if ( $show_version ) {
+            wp_localize_script(
+                $this->plugin_name,
+                'wordlift',
+                array(
+                    'version' => $this->version,
+                )
+            );
+        }
+
+        /*
 		 * Register wordlift-cloud script which is shared by
 		 * Navigator, Products Navigator, Faceted Search, Context Cards
 		 *
 		 * @since 3.22.0
 		 *
 		 */
-		$deps = $this->wp_version_compare( '>=', '5.0' ) ? array( 'wp-hooks' ) : array();
+        $deps = $this->wp_version_compare( '>=', '5.0' ) ? array( 'wp-hooks' ) : array();
 
-		/*
+        /*
 		 * Added defer to wordlift-cloud
 		 *
 		 * @since 3.27.4
 		 */
-		add_filter(
-			'script_loader_tag',
-			function ( $tag, $handle ) {
-				if ( 'wordlift-cloud' !== $handle ) {
-					return $tag;
-				}
-
-				return str_replace( ' src', ' defer="defer" src', $tag );
-			},
-			10,
-			2
-		);
-		wp_register_script( 'wordlift-cloud', self::get_cloud_js_url(), $deps, Wordlift::get_instance()->get_version(), true );
-
-	}
-
-	/**
-	 * Get the settings array.
-	 *
-	 * @return array An array with the settings.
-	 * @since 3.19.1
-	 */
-	public static function get_settings() {
-
-		// Prepare a settings array for client-side functions.
-		$settings = array(
-			'ajaxUrl'    => admin_url( 'admin-ajax.php' ),
-			'apiUrl'     => get_home_url( null, 'wl-api/' ),
-			'jsonld_url' => rest_url( '/wordlift/v1/jsonld/' ),
-		);
-
-		// If we're in a single page, then print out the post id.
-		if ( is_singular() ) {
-			$settings['postId'] = get_the_ID();
-		}
-
-		// Add flag that we are on home/blog page.
-		if ( is_home() || is_front_page() ) {
-			$settings['isHome'] = true;
-		}
-
-		// As of 2020-02-15, we publish the JSON-LD in the head, see Jsonld_Adaper.
-		$settings['jsonld_enabled'] = false;
-
-		// By default only enable JSON-LD on supported entity pages (includes
-		// `page`, `post` and `entity` by default) and on the home page.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/733
-		// $jsonld_enabled = is_home() || is_front_page() || Wordlift_Entity_Type_Service::is_valid_entity_post_type( get_post_type() );
-
-		// Add the JSON-LD enabled flag, when set to false, the JSON-LD won't
-		// be loaded.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/642.
-		// $settings['jsonld_enabled'] = apply_filters( 'wl_jsonld_enabled', $jsonld_enabled );
-
-		return $settings;
-	}
-
-	/**
-	 * Get the public JavaScript URL.
-	 *
-	 * Using this function is encouraged, since the public JavaScript is also used by the {@link Wordlift_WpRocket_Adapter}
-	 * in order to avoid breaking optimizations.
-	 *
-	 * @return string The URL to the public JavaScript.
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/842.
-	 *
-	 * @since 3.19.4
-	 */
-	public static function get_public_js_url() {
-
-		return plugin_dir_url( __DIR__ ) . 'js/dist/bundle.js';
-	}
-
-	/**
-	 * Get the Cloud JavaScript URL.
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/971
-	 * @since 3.23.0
-	 * @return string The URL to the Cloud JavaScript.
-	 */
-	public static function get_cloud_js_url() {
-
-		return plugin_dir_url( __DIR__ ) . 'js/dist/wordlift-cloud.js';
-	}
-
-	/**
-	 * Helper function to check WP version
-	 *
-	 * @since 3.26.0
-	 *
-	 * @param string $operator
-	 * @param string $version
-	 *
-	 * @return mixed
-	 */
-	private function wp_version_compare( $operator = '>', $version = '5.0' ) {
-		global $wp_version;
-
-		return version_compare( $wp_version, $version, $operator );
-	}
+        add_filter(
+            'script_loader_tag',
+            function ( $tag, $handle ) {
+                if ( 'wordlift-cloud' !== $handle ) {
+                    return $tag;
+                }
+
+                return str_replace( ' src', ' defer="defer" src', $tag );
+            },
+            10,
+            2
+        );
+        wp_register_script( 'wordlift-cloud', self::get_cloud_js_url(), $deps, Wordlift::get_instance()->get_version(), true );
+
+    }
+
+    /**
+     * Get the settings array.
+     *
+     * @return array An array with the settings.
+     * @since 3.19.1
+     */
+    public static function get_settings() {
+
+        // Prepare a settings array for client-side functions.
+        $settings = array(
+            'ajaxUrl'    => admin_url( 'admin-ajax.php' ),
+            'apiUrl'     => get_home_url( null, 'wl-api/' ),
+            'jsonld_url' => rest_url( '/wordlift/v1/jsonld/' ),
+        );
+
+        // If we're in a single page, then print out the post id.
+        if ( is_singular() ) {
+            $settings['postId'] = get_the_ID();
+        }
+
+        // Add flag that we are on home/blog page.
+        if ( is_home() || is_front_page() ) {
+            $settings['isHome'] = true;
+        }
+
+        // As of 2020-02-15, we publish the JSON-LD in the head, see Jsonld_Adaper.
+        $settings['jsonld_enabled'] = false;
+
+        // By default only enable JSON-LD on supported entity pages (includes
+        // `page`, `post` and `entity` by default) and on the home page.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/733
+        // $jsonld_enabled = is_home() || is_front_page() || Wordlift_Entity_Type_Service::is_valid_entity_post_type( get_post_type() );
+
+        // Add the JSON-LD enabled flag, when set to false, the JSON-LD won't
+        // be loaded.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/642.
+        // $settings['jsonld_enabled'] = apply_filters( 'wl_jsonld_enabled', $jsonld_enabled );
+
+        return $settings;
+    }
+
+    /**
+     * Get the public JavaScript URL.
+     *
+     * Using this function is encouraged, since the public JavaScript is also used by the {@link Wordlift_WpRocket_Adapter}
+     * in order to avoid breaking optimizations.
+     *
+     * @return string The URL to the public JavaScript.
+     * @see https://github.com/insideout10/wordlift-plugin/issues/842.
+     *
+     * @since 3.19.4
+     */
+    public static function get_public_js_url() {
+
+        return plugin_dir_url( __DIR__ ) . 'js/dist/bundle.js';
+    }
+
+    /**
+     * Get the Cloud JavaScript URL.
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/971
+     * @since 3.23.0
+     * @return string The URL to the Cloud JavaScript.
+     */
+    public static function get_cloud_js_url() {
+
+        return plugin_dir_url( __DIR__ ) . 'js/dist/wordlift-cloud.js';
+    }
+
+    /**
+     * Helper function to check WP version
+     *
+     * @since 3.26.0
+     *
+     * @param string $operator
+     * @param string $version
+     *
+     * @return mixed
+     */
+    private function wp_version_compare( $operator = '>', $version = '5.0' ) {
+        global $wp_version;
+
+        return version_compare( $wp_version, $version, $operator );
+    }
 }

Spacing +23 added lines, -23 removed lines

@@ -48,7 +48,7 @@ 
 	 *
 	 * @since    1.0.0
 	 */
-	public function __construct( $plugin_name, $version ) {
+	public function __construct($plugin_name, $version) {
 
 		$this->plugin_name = $plugin_name;
 		$this->version     = $version;
@@ -82,11 +82,11 @@ 
 		 *
 		 * @since 3.19.3
 		 */
-		$deps = apply_filters( 'wl_include_font_awesome', true )
-			? array( 'wordlift-font-awesome' )
+		$deps = apply_filters('wl_include_font_awesome', true)
+			? array('wordlift-font-awesome')
 			: array();
-		wp_register_style( 'wordlift-font-awesome', plugin_dir_url( __DIR__ ) . 'css/wordlift-font-awesome' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', array(), $this->version, 'all' );
-		wp_register_style( 'wordlift-ui', plugin_dir_url( __DIR__ ) . 'css/wordlift-ui' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', $deps, $this->version, 'all' );
+		wp_register_style('wordlift-font-awesome', plugin_dir_url(__DIR__).'css/wordlift-font-awesome'.( ! defined('SCRIPT_DEBUG') || ! SCRIPT_DEBUG ? '.min' : '').'.css', array(), $this->version, 'all');
+		wp_register_style('wordlift-ui', plugin_dir_url(__DIR__).'css/wordlift-ui'.( ! defined('SCRIPT_DEBUG') || ! SCRIPT_DEBUG ? '.min' : '').'.css', $deps, $this->version, 'all');
 
 		// You need to re-enable the enqueue_styles in `class-wordlift.php` to make this effective.
 		//
@@ -118,8 +118,8 @@ 
 
 		// Note that we switched the js to be loaded in footer, since it is loading
 		// the json-ld representation.
-		wp_enqueue_script( $this->plugin_name, self::get_public_js_url(), array(), $this->version, true );
-		wp_localize_script( $this->plugin_name, 'wlSettings', $settings );
+		wp_enqueue_script($this->plugin_name, self::get_public_js_url(), array(), $this->version, true);
+		wp_localize_script($this->plugin_name, 'wlSettings', $settings);
 
 		/*
 		 * Add WordLift's version.
@@ -131,9 +131,9 @@ 
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/926.
 		 */
 		$show_version_default = false;
-		$show_version         = apply_filters( 'wl_disable_version_js', $show_version_default );
+		$show_version         = apply_filters('wl_disable_version_js', $show_version_default);
 
-		if ( $show_version ) {
+		if ($show_version) {
 			wp_localize_script(
 				$this->plugin_name,
 				'wordlift',
@@ -150,7 +150,7 @@ 
 		 * @since 3.22.0
 		 *
 		 */
-		$deps = $this->wp_version_compare( '>=', '5.0' ) ? array( 'wp-hooks' ) : array();
+		$deps = $this->wp_version_compare('>=', '5.0') ? array('wp-hooks') : array();
 
 		/*
 		 * Added defer to wordlift-cloud
@@ -159,17 +159,17 @@ 
 		 */
 		add_filter(
 			'script_loader_tag',
-			function ( $tag, $handle ) {
-				if ( 'wordlift-cloud' !== $handle ) {
+			function($tag, $handle) {
+				if ('wordlift-cloud' !== $handle) {
 					return $tag;
 				}
 
-				return str_replace( ' src', ' defer="defer" src', $tag );
+				return str_replace(' src', ' defer="defer" src', $tag);
 			},
 			10,
 			2
 		);
-		wp_register_script( 'wordlift-cloud', self::get_cloud_js_url(), $deps, Wordlift::get_instance()->get_version(), true );
+		wp_register_script('wordlift-cloud', self::get_cloud_js_url(), $deps, Wordlift::get_instance()->get_version(), true);
 
 	}
 
@@ -183,18 +183,18 @@ 
 
 		// Prepare a settings array for client-side functions.
 		$settings = array(
-			'ajaxUrl'    => admin_url( 'admin-ajax.php' ),
-			'apiUrl'     => get_home_url( null, 'wl-api/' ),
-			'jsonld_url' => rest_url( '/wordlift/v1/jsonld/' ),
+			'ajaxUrl'    => admin_url('admin-ajax.php'),
+			'apiUrl'     => get_home_url(null, 'wl-api/'),
+			'jsonld_url' => rest_url('/wordlift/v1/jsonld/'),
 		);
 
 		// If we're in a single page, then print out the post id.
-		if ( is_singular() ) {
+		if (is_singular()) {
 			$settings['postId'] = get_the_ID();
 		}
 
 		// Add flag that we are on home/blog page.
-		if ( is_home() || is_front_page() ) {
+		if (is_home() || is_front_page()) {
 			$settings['isHome'] = true;
 		}
 
@@ -229,7 +229,7 @@ 
 	 */
 	public static function get_public_js_url() {
 
-		return plugin_dir_url( __DIR__ ) . 'js/dist/bundle.js';
+		return plugin_dir_url(__DIR__).'js/dist/bundle.js';
 	}
 
 	/**
@@ -241,7 +241,7 @@ 
 	 */
 	public static function get_cloud_js_url() {
 
-		return plugin_dir_url( __DIR__ ) . 'js/dist/wordlift-cloud.js';
+		return plugin_dir_url(__DIR__).'js/dist/wordlift-cloud.js';
 	}
 
 	/**
@@ -254,9 +254,9 @@ 
 	 *
 	 * @return mixed
 	 */
-	private function wp_version_compare( $operator = '>', $version = '5.0' ) {
+	private function wp_version_compare($operator = '>', $version = '5.0') {
 		global $wp_version;
 
-		return version_compare( $wp_version, $version, $operator );
+		return version_compare($wp_version, $version, $operator);
 	}
 }

src/public/class-wordlift-navigator-shortcode.php

Indentation +207 added lines, -207 removed lines

@@ -17,134 +17,134 @@ 
  */
 class Wordlift_Navigator_Shortcode extends Wordlift_Shortcode {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	const SHORTCODE = 'wl_navigator';
+    /**
+     * {@inheritdoc}
+     */
+    const SHORTCODE = 'wl_navigator';
 
-	public function __construct() {
-		parent::__construct();
-		$this->register_block_type();
-	}
+    public function __construct() {
+        parent::__construct();
+        $this->register_block_type();
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function render( $atts ) {
-		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
-			: $this->web_shortcode( $atts );
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function render( $atts ) {
+        return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
+            : $this->web_shortcode( $atts );
+    }
 
-	private function register_block_type() {
+    private function register_block_type() {
 
-		$scope = $this;
+        $scope = $this;
 
-		add_action(
-			'init',
-			function () use ( $scope ) {
-				if ( ! function_exists( 'register_block_type' ) ) {
-					// Gutenberg is not active.
-					return;
-				}
+        add_action(
+            'init',
+            function () use ( $scope ) {
+                if ( ! function_exists( 'register_block_type' ) ) {
+                    // Gutenberg is not active.
+                    return;
+                }
 
-				register_block_type(
-					'wordlift/navigator',
-					array(
-						'editor_script'   => 'wl-block-editor',
-						'render_callback' => function ( $attributes ) use ( $scope ) {
-							$attr_code = '';
-							foreach ( $attributes as $key => $value ) {
-								$attr_code .= $key . '="' . htmlentities( $value ) . '" ';
-							}
+                register_block_type(
+                    'wordlift/navigator',
+                    array(
+                        'editor_script'   => 'wl-block-editor',
+                        'render_callback' => function ( $attributes ) use ( $scope ) {
+                            $attr_code = '';
+                            foreach ( $attributes as $key => $value ) {
+                                $attr_code .= $key . '="' . htmlentities( $value ) . '" ';
+                            }
 
-							return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
-						},
-						'attributes'      => $scope->get_navigator_block_attributes(),
-					)
-				);
-			}
-		);
-	}
+                            return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+                        },
+                        'attributes'      => $scope->get_navigator_block_attributes(),
+                    )
+                );
+            }
+        );
+    }
 
-	/**
-	 * Shared function used by web_shortcode and amp_shortcode
-	 * Bootstrap logic for attributes extraction and boolean filtering
-	 *
-	 * @param array $atts Shortcode attributes.
-	 *
-	 * @return array $shortcode_atts
-	 * @since      3.20.0
-	 */
-	private function make_shortcode_atts( $atts ) {
+    /**
+     * Shared function used by web_shortcode and amp_shortcode
+     * Bootstrap logic for attributes extraction and boolean filtering
+     *
+     * @param array $atts Shortcode attributes.
+     *
+     * @return array $shortcode_atts
+     * @since      3.20.0
+     */
+    private function make_shortcode_atts( $atts ) {
 
-		// Extract attributes and set default values.
-		$shortcode_atts = shortcode_atts(
-			array(
-				'title'       => __( 'Related articles', 'wordlift' ),
-				'limit'       => 4,
-				'offset'      => 0,
-				'template_id' => '',
-				'post_id'     => '',
-				'uniqid'      => uniqid( 'wl-navigator-widget-' ),
-				'order_by'    => 'ID DESC',
-				'post_types'  => '',
-			),
-			$atts
-		);
+        // Extract attributes and set default values.
+        $shortcode_atts = shortcode_atts(
+            array(
+                'title'       => __( 'Related articles', 'wordlift' ),
+                'limit'       => 4,
+                'offset'      => 0,
+                'template_id' => '',
+                'post_id'     => '',
+                'uniqid'      => uniqid( 'wl-navigator-widget-' ),
+                'order_by'    => 'ID DESC',
+                'post_types'  => '',
+            ),
+            $atts
+        );
 
-		return $shortcode_atts;
-	}
+        return $shortcode_atts;
+    }
 
-	/**
-	 * Function in charge of displaying the [wl-navigator] in web mode.
-	 *
-	 * @param array $atts Shortcode attributes.
-	 *
-	 * @return string Shortcode HTML for web
-	 * @since 3.20.0
-	 */
-	private function web_shortcode( $atts ) {
+    /**
+     * Function in charge of displaying the [wl-navigator] in web mode.
+     *
+     * @param array $atts Shortcode attributes.
+     *
+     * @return string Shortcode HTML for web
+     * @since 3.20.0
+     */
+    private function web_shortcode( $atts ) {
 
-		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
+        // attributes extraction and boolean filtering
+        $shortcode_atts = $this->make_shortcode_atts( $atts );
 
-		// avoid building the widget when no post_id is specified and there is a list of posts.
-		if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
-			return;
-		}
+        // avoid building the widget when no post_id is specified and there is a list of posts.
+        if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
+            return;
+        }
 
-		$post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $shortcode_atts['post_id'] ) ) : get_post();
-		$title        = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
-		$template_id  = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
-		$limit        = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
-		$offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
-		$sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
-		$navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-navigator-widget-' );
+        $post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $shortcode_atts['post_id'] ) ) : get_post();
+        $title        = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
+        $template_id  = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
+        $limit        = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
+        $offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
+        $sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
+        $navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-navigator-widget-' );
 
-		$rest_url = $post ? admin_url(
-			'admin-ajax.php?' . build_query(
-				array(
-					'action'     => 'wl_navigator',
-					'uniqid'     => $navigator_id,
-					'post_id'    => $post->ID,
-					'limit'      => $limit,
-					'offset'     => $offset,
-					'sort'       => $sort,
-					'post_types' => $shortcode_atts['post_types'],
-					'_wpnonce'   => wp_create_nonce( 'wl_navigator' ),
-				)
-			)
-		) : false;
+        $rest_url = $post ? admin_url(
+            'admin-ajax.php?' . build_query(
+                array(
+                    'action'     => 'wl_navigator',
+                    'uniqid'     => $navigator_id,
+                    'post_id'    => $post->ID,
+                    'limit'      => $limit,
+                    'offset'     => $offset,
+                    'sort'       => $sort,
+                    'post_types' => $shortcode_atts['post_types'],
+                    '_wpnonce'   => wp_create_nonce( 'wl_navigator' ),
+                )
+            )
+        ) : false;
 
-		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
-			return;
-		}
+        // avoid building the widget when no valid $rest_url
+        if ( ! $rest_url ) {
+            return;
+        }
 
-		wp_enqueue_script( 'wordlift-cloud' );
-		$template_url = get_rest_url( null, '/wordlift/v1/navigator/template' );
+        wp_enqueue_script( 'wordlift-cloud' );
+        $template_url = get_rest_url( null, '/wordlift/v1/navigator/template' );
 
-		return <<<HTML
+        return <<<HTML
 			<!-- Navigator {$navigator_id} -->
 			<div id="{$navigator_id}" 
 				 class="wl-navigator" 
@@ -155,63 +155,63 @@ 
 				 data-limit="{$limit}"></div>
 			<!-- /Navigator {$navigator_id} -->
 HTML;
-	}
+    }
 
-	/**
-	 * Function in charge of diplaying the [wl-faceted-search] in amp mode.
-	 *
-	 * @param array $atts Shortcode attributes.
-	 *
-	 * @return string Shortcode HTML for amp
-	 * @since 3.20.0
-	 */
-	private function amp_shortcode( $atts ) {
-		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
+    /**
+     * Function in charge of diplaying the [wl-faceted-search] in amp mode.
+     *
+     * @param array $atts Shortcode attributes.
+     *
+     * @return string Shortcode HTML for amp
+     * @since 3.20.0
+     */
+    private function amp_shortcode( $atts ) {
+        // attributes extraction and boolean filtering
+        $shortcode_atts = $this->make_shortcode_atts( $atts );
 
-		// avoid building the widget when no post_id is specified and there is a list of posts.
-		if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
-			return;
-		}
+        // avoid building the widget when no post_id is specified and there is a list of posts.
+        if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
+            return;
+        }
 
-		$post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $shortcode_atts['post_id'] ) ) : get_post();
-		$title        = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
-		$template_id  = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
-		$limit        = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
-		$offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
-		$sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
-		$navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-navigator-widget-' );
+        $post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $shortcode_atts['post_id'] ) ) : get_post();
+        $title        = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
+        $template_id  = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
+        $limit        = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
+        $offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
+        $sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
+        $navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-navigator-widget-' );
 
-		$permalink_structure = get_option( 'permalink_structure' );
-		$delimiter           = empty( $permalink_structure ) ? '&' : '?';
-		$rest_url            = $post ? rest_url(
-			WL_REST_ROUTE_DEFAULT_NAMESPACE . '/navigator' . $delimiter . build_query(
-				array(
-					'uniqid'   => $navigator_id,
-					'post_id'  => $post->ID,
-					'limit'    => $limit,
-					'offset'   => $offset,
-					'sort'     => $sort,
-					'_wpnonce' => wp_create_nonce( 'wl_navigator' ),
-				)
-			)
-		) : false;
+        $permalink_structure = get_option( 'permalink_structure' );
+        $delimiter           = empty( $permalink_structure ) ? '&' : '?';
+        $rest_url            = $post ? rest_url(
+            WL_REST_ROUTE_DEFAULT_NAMESPACE . '/navigator' . $delimiter . build_query(
+                array(
+                    'uniqid'   => $navigator_id,
+                    'post_id'  => $post->ID,
+                    'limit'    => $limit,
+                    'offset'   => $offset,
+                    'sort'     => $sort,
+                    '_wpnonce' => wp_create_nonce( 'wl_navigator' ),
+                )
+            )
+        ) : false;
 
-		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
-			return;
-		}
+        // avoid building the widget when no valid $rest_url
+        if ( ! $rest_url ) {
+            return;
+        }
 
-		// Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
-		// This is a hackish way, but this works for http and https URLs
-		$rest_url = str_replace( array( 'http:', 'https:' ), '', $rest_url );
+        // Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
+        // This is a hackish way, but this works for http and https URLs
+        $rest_url = str_replace( array( 'http:', 'https:' ), '', $rest_url );
 
-		if ( empty( $template_id ) ) {
-			$template_id = 'template-' . $navigator_id;
-			wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( __DIR__ ) . '/css/wordlift-amp-custom.min.css', array(), WORDLIFT_VERSION );
-		}
+        if ( empty( $template_id ) ) {
+            $template_id = 'template-' . $navigator_id;
+            wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( __DIR__ ) . '/css/wordlift-amp-custom.min.css', array(), WORDLIFT_VERSION );
+        }
 
-		return <<<HTML
+        return <<<HTML
 		<div id="{$navigator_id}" class="wl-amp-navigator" style="width: 100%">
 			<h3 class="wl-headline">{$title}</h3>
 			<amp-list 
@@ -244,54 +244,54 @@ 
 			</div>
 		</template>
 HTML;
-	}
+    }
 
-	/**
-	 * @return array
-	 */
-	public function get_navigator_block_attributes() {
-		return array(
-			'title'       => array(
-				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' ),
-			),
-			'limit'       => array(
-				'type'    => 'number',
-				'default' => 4,
-			),
-			'template_id' => array(
-				'type'    => 'string',
-				'default' => '',
-			),
-			'post_id'     => array(
-				'type'    => 'number',
-				'default' => '',
-			),
-			'offset'      => array(
-				'type'    => 'number',
-				'default' => 0,
-			),
-			'uniqid'      => array(
-				'type'    => 'string',
-				'default' => '',
-			),
-			'order_by'    => array(
-				'type'    => 'string',
-				'default' => 'ID DESC',
-			),
-			'preview'     => array(
-				'type'    => 'boolean',
-				'default' => false,
-			),
-			'preview_src' => array(
-				'type'    => 'string',
-				'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/navigator.png',
-			),
-			'post_types'  => array(
-				'type'    => 'string',
-				'default' => '',
-			),
-		);
-	}
+    /**
+     * @return array
+     */
+    public function get_navigator_block_attributes() {
+        return array(
+            'title'       => array(
+                'type'    => 'string',
+                'default' => __( 'Related articles', 'wordlift' ),
+            ),
+            'limit'       => array(
+                'type'    => 'number',
+                'default' => 4,
+            ),
+            'template_id' => array(
+                'type'    => 'string',
+                'default' => '',
+            ),
+            'post_id'     => array(
+                'type'    => 'number',
+                'default' => '',
+            ),
+            'offset'      => array(
+                'type'    => 'number',
+                'default' => 0,
+            ),
+            'uniqid'      => array(
+                'type'    => 'string',
+                'default' => '',
+            ),
+            'order_by'    => array(
+                'type'    => 'string',
+                'default' => 'ID DESC',
+            ),
+            'preview'     => array(
+                'type'    => 'boolean',
+                'default' => false,
+            ),
+            'preview_src' => array(
+                'type'    => 'string',
+                'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/navigator.png',
+            ),
+            'post_types'  => array(
+                'type'    => 'string',
+                'default' => '',
+            ),
+        );
+    }
 
 }

Spacing +48 added lines, -48 removed lines

@@ -30,9 +30,9 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function render( $atts ) {
-		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
-			: $this->web_shortcode( $atts );
+	public function render($atts) {
+		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode($atts)
+			: $this->web_shortcode($atts);
 	}
 
 	private function register_block_type() {
@@ -41,8 +41,8 @@ 
 
 		add_action(
 			'init',
-			function () use ( $scope ) {
-				if ( ! function_exists( 'register_block_type' ) ) {
+			function() use ($scope) {
+				if ( ! function_exists('register_block_type')) {
 					// Gutenberg is not active.
 					return;
 				}
@@ -51,13 +51,13 @@ 
 					'wordlift/navigator',
 					array(
 						'editor_script'   => 'wl-block-editor',
-						'render_callback' => function ( $attributes ) use ( $scope ) {
+						'render_callback' => function($attributes) use ($scope) {
 							$attr_code = '';
-							foreach ( $attributes as $key => $value ) {
-								$attr_code .= $key . '="' . htmlentities( $value ) . '" ';
+							foreach ($attributes as $key => $value) {
+								$attr_code .= $key.'="'.htmlentities($value).'" ';
 							}
 
-							return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+							return '['.$scope::SHORTCODE.' '.$attr_code.']';
 						},
 						'attributes'      => $scope->get_navigator_block_attributes(),
 					)
@@ -75,17 +75,17 @@ 
 	 * @return array $shortcode_atts
 	 * @since      3.20.0
 	 */
-	private function make_shortcode_atts( $atts ) {
+	private function make_shortcode_atts($atts) {
 
 		// Extract attributes and set default values.
 		$shortcode_atts = shortcode_atts(
 			array(
-				'title'       => __( 'Related articles', 'wordlift' ),
+				'title'       => __('Related articles', 'wordlift'),
 				'limit'       => 4,
 				'offset'      => 0,
 				'template_id' => '',
 				'post_id'     => '',
-				'uniqid'      => uniqid( 'wl-navigator-widget-' ),
+				'uniqid'      => uniqid('wl-navigator-widget-'),
 				'order_by'    => 'ID DESC',
 				'post_types'  => '',
 			),
@@ -103,26 +103,26 @@ 
 	 * @return string Shortcode HTML for web
 	 * @since 3.20.0
 	 */
-	private function web_shortcode( $atts ) {
+	private function web_shortcode($atts) {
 
 		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
+		$shortcode_atts = $this->make_shortcode_atts($atts);
 
 		// avoid building the widget when no post_id is specified and there is a list of posts.
-		if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
+		if (empty($shortcode_atts['post_id']) && ! is_singular()) {
 			return;
 		}
 
-		$post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $shortcode_atts['post_id'] ) ) : get_post();
-		$title        = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
-		$template_id  = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
-		$limit        = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
-		$offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
-		$sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
-		$navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-navigator-widget-' );
+		$post         = ! empty($shortcode_atts['post_id']) ? get_post(intval($shortcode_atts['post_id'])) : get_post();
+		$title        = esc_attr(sanitize_text_field($shortcode_atts['title']));
+		$template_id  = esc_attr(sanitize_text_field($shortcode_atts['template_id']));
+		$limit        = esc_attr(sanitize_text_field($shortcode_atts['limit']));
+		$offset       = esc_attr(sanitize_text_field($shortcode_atts['offset']));
+		$sort         = esc_attr(sanitize_sql_orderby(sanitize_text_field($shortcode_atts['order_by'])));
+		$navigator_id = ! empty($shortcode_atts['uniqid']) ? esc_attr(sanitize_text_field($shortcode_atts['uniqid'])) : uniqid('wl-navigator-widget-');
 
 		$rest_url = $post ? admin_url(
-			'admin-ajax.php?' . build_query(
+			'admin-ajax.php?'.build_query(
 				array(
 					'action'     => 'wl_navigator',
 					'uniqid'     => $navigator_id,
@@ -131,18 +131,18 @@ 
 					'offset'     => $offset,
 					'sort'       => $sort,
 					'post_types' => $shortcode_atts['post_types'],
-					'_wpnonce'   => wp_create_nonce( 'wl_navigator' ),
+					'_wpnonce'   => wp_create_nonce('wl_navigator'),
 				)
 			)
 		) : false;
 
 		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
+		if ( ! $rest_url) {
 			return;
 		}
 
-		wp_enqueue_script( 'wordlift-cloud' );
-		$template_url = get_rest_url( null, '/wordlift/v1/navigator/template' );
+		wp_enqueue_script('wordlift-cloud');
+		$template_url = get_rest_url(null, '/wordlift/v1/navigator/template');
 
 		return <<<HTML
 			<!-- Navigator {$navigator_id} -->
@@ -165,50 +165,50 @@ 
 	 * @return string Shortcode HTML for amp
 	 * @since 3.20.0
 	 */
-	private function amp_shortcode( $atts ) {
+	private function amp_shortcode($atts) {
 		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
+		$shortcode_atts = $this->make_shortcode_atts($atts);
 
 		// avoid building the widget when no post_id is specified and there is a list of posts.
-		if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
+		if (empty($shortcode_atts['post_id']) && ! is_singular()) {
 			return;
 		}
 
-		$post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $shortcode_atts['post_id'] ) ) : get_post();
-		$title        = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
-		$template_id  = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
-		$limit        = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
-		$offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
-		$sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
-		$navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-navigator-widget-' );
+		$post         = ! empty($shortcode_atts['post_id']) ? get_post(intval($shortcode_atts['post_id'])) : get_post();
+		$title        = esc_attr(sanitize_text_field($shortcode_atts['title']));
+		$template_id  = esc_attr(sanitize_text_field($shortcode_atts['template_id']));
+		$limit        = esc_attr(sanitize_text_field($shortcode_atts['limit']));
+		$offset       = esc_attr(sanitize_text_field($shortcode_atts['offset']));
+		$sort         = esc_attr(sanitize_sql_orderby(sanitize_text_field($shortcode_atts['order_by'])));
+		$navigator_id = ! empty($shortcode_atts['uniqid']) ? esc_attr(sanitize_text_field($shortcode_atts['uniqid'])) : uniqid('wl-navigator-widget-');
 
-		$permalink_structure = get_option( 'permalink_structure' );
-		$delimiter           = empty( $permalink_structure ) ? '&' : '?';
+		$permalink_structure = get_option('permalink_structure');
+		$delimiter           = empty($permalink_structure) ? '&' : '?';
 		$rest_url            = $post ? rest_url(
-			WL_REST_ROUTE_DEFAULT_NAMESPACE . '/navigator' . $delimiter . build_query(
+			WL_REST_ROUTE_DEFAULT_NAMESPACE.'/navigator'.$delimiter.build_query(
 				array(
 					'uniqid'   => $navigator_id,
 					'post_id'  => $post->ID,
 					'limit'    => $limit,
 					'offset'   => $offset,
 					'sort'     => $sort,
-					'_wpnonce' => wp_create_nonce( 'wl_navigator' ),
+					'_wpnonce' => wp_create_nonce('wl_navigator'),
 				)
 			)
 		) : false;
 
 		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
+		if ( ! $rest_url) {
 			return;
 		}
 
 		// Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
 		// This is a hackish way, but this works for http and https URLs
-		$rest_url = str_replace( array( 'http:', 'https:' ), '', $rest_url );
+		$rest_url = str_replace(array('http:', 'https:'), '', $rest_url);
 
-		if ( empty( $template_id ) ) {
-			$template_id = 'template-' . $navigator_id;
-			wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( __DIR__ ) . '/css/wordlift-amp-custom.min.css', array(), WORDLIFT_VERSION );
+		if (empty($template_id)) {
+			$template_id = 'template-'.$navigator_id;
+			wp_enqueue_style('wordlift-amp-custom', plugin_dir_url(__DIR__).'/css/wordlift-amp-custom.min.css', array(), WORDLIFT_VERSION);
 		}
 
 		return <<<HTML
@@ -253,7 +253,7 @@ 
 		return array(
 			'title'       => array(
 				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' ),
+				'default' => __('Related articles', 'wordlift'),
 			),
 			'limit'       => array(
 				'type'    => 'number',
@@ -285,7 +285,7 @@ 
 			),
 			'preview_src' => array(
 				'type'    => 'string',
-				'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/navigator.png',
+				'default' => WP_CONTENT_URL.'/plugins/wordlift/images/block-previews/navigator.png',
 			),
 			'post_types'  => array(
 				'type'    => 'string',