insideout10 / wordlift-plugin

src/wordlift/cache/class-ttl-cache-cleaner.php

Doc Comments +4 added lines, -1 removed lines

@@ -124,6 +124,9 @@ 
 		) );
 	}
 
+	/**
+	 * @param string $path
+	 */
 	private function reduce( $accumulator, $path ) {
 
 		/**
@@ -157,7 +160,7 @@ 
 	/**
 	 * @param $accumulator
 	 * @param $path
-	 * @param $handle
+	 * @param resource $handle
 	 *
 	 * @return array
 	 */

Indentation +168 added lines, -168 removed lines

@@ -21,174 +21,174 @@
 
 class Ttl_Cache_Cleaner {
 
-	const PATH = 0;
-	const MTIME = 1;
-	const SIZE = 2;
-
-	/**
-	 * The max TTL in seconds.
-	 *
-	 * @access private
-	 * @var int $ttl The max TTL in seconds.
-	 */
-	private $ttl;
-
-	/**
-	 * The max size in bytes.
-	 *
-	 * @access private
-	 * @var int $ttl The max size in bytes.
-	 */
-	private $max_size;
-
-	/**
-	 * Ttl_Cache_Cleaner constructor.
-	 *
-	 * @param int $ttl The max TTL in seconds.
-	 * @param int $max_size The max size in bytes.
-	 */
-	public function __construct( $ttl = WORDLIFT_CACHE_DEFAULT_TTL, $max_size = WORDLIFT_CACHE_DEFAULT_MAX_SIZE ) {
-
-		$this->ttl      = $ttl;
-		$this->max_size = $max_size;
-
-		add_action( 'wp_ajax_wl_ttl_cache_cleaner__cleanup', array( $this, 'cleanup' ) );
-		add_action( 'wl_ttl_cache_cleaner__cleanup', array( $this, 'cleanup' ) );
-
-		// Do not bother to configure scheduled tasks while running on the front-end.
-		if ( is_admin() && ! wp_next_scheduled( 'wl_ttl_cache_cleaner__cleanup' ) ) {
-			wp_schedule_event( time(), 'hourly', 'wl_ttl_cache_cleaner__cleanup' );
-		}
-
-	}
-
-	public static function deactivate() {
-
-		$timestamp = wp_next_scheduled( 'wl_ttl_cache_cleaner__cleanup' );
-		wp_unschedule_event( $timestamp, 'wl_ttl_cache_cleaner__cleanup' );
-
-	}
-
-	public function cleanup() {
-
-		// Get all the files, recursive.
-		$files = $this->reduce( array(), Ttl_Cache::get_cache_folder() );
-
-
-		// Get the max mtime.
-		$max_mtime = time() - WORDLIFT_CACHE_DEFAULT_TTL;
-
-		// Keep the original count for statistics that we're going to send the client.
-		$original_count = count( $files );
-
-		// Sort by size ascending.
-		usort( $files, function ( $f1, $f2 ) {
-			if ( $f1[ Ttl_Cache_Cleaner::MTIME ] === $f2[ Ttl_Cache_Cleaner::MTIME ] ) {
-				return 0;
-			}
-
-			return ( $f1[ Ttl_Cache_Cleaner::MTIME ] < $f2[ Ttl_Cache_Cleaner::MTIME ] ) ? - 1 : 1;
-		} );
-
-		// Start removing stale files.
-		for ( $i = 0; $i < count( $files ); $i ++ ) {
-			$file = $files[ $i ];
-			// Break if the mtime is within the range.
-			if ( $file[ Ttl_Cache_Cleaner::MTIME ] > $max_mtime ) {
-				break;
-			}
-
-			unset( $files[ $i ] );
-			@unlink( $file[ Ttl_Cache_Cleaner::PATH ] );
-		}
-
-		// Calculate the size.
-		$total_size = array_reduce( $files, function ( $carry, $item ) {
-
-			return $carry + $item[ Ttl_Cache_Cleaner::SIZE ];
-		}, 0 );
-
-
-		// Remove files until we're within the max size.
-		while ( $total_size > $this->max_size ) {
-			$file       = array_shift( $files );
-			$total_size -= $file[ Ttl_Cache_Cleaner::SIZE ];
-			@unlink( $file[ Ttl_Cache_Cleaner::PATH ] );
-		}
-
-		// Send back some stats.
-		wp_send_json_success( array(
-			'initial_count' => $original_count,
-			'current_count' => count( $files ),
-			'current_size'  => $total_size,
-		) );
-	}
-
-	private function reduce( $accumulator, $path ) {
-
-		/**
-		 * Bail out if the path doesn't exist.
-		 *
-		 * Avoid warnings when trying to open a path which doesn't exist.
-		 *
-		 * @since 3.23.0
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/966
-		 */
-		if ( ! file_exists( $path ) ) {
-			return $accumulator;
-		}
-
-		// Open the dir handle.
-		$handle = opendir( $path );
-
-		// Catch exceptions to be sure to close the dir handle.
-		try {
-			$accumulator = @$this->_reduce( $accumulator, $path, $handle );
-		} catch ( Exception $e ) {
-			// Do nothing.
-		}
+    const PATH = 0;
+    const MTIME = 1;
+    const SIZE = 2;
+
+    /**
+     * The max TTL in seconds.
+     *
+     * @access private
+     * @var int $ttl The max TTL in seconds.
+     */
+    private $ttl;
+
+    /**
+     * The max size in bytes.
+     *
+     * @access private
+     * @var int $ttl The max size in bytes.
+     */
+    private $max_size;
+
+    /**
+     * Ttl_Cache_Cleaner constructor.
+     *
+     * @param int $ttl The max TTL in seconds.
+     * @param int $max_size The max size in bytes.
+     */
+    public function __construct( $ttl = WORDLIFT_CACHE_DEFAULT_TTL, $max_size = WORDLIFT_CACHE_DEFAULT_MAX_SIZE ) {
+
+        $this->ttl      = $ttl;
+        $this->max_size = $max_size;
+
+        add_action( 'wp_ajax_wl_ttl_cache_cleaner__cleanup', array( $this, 'cleanup' ) );
+        add_action( 'wl_ttl_cache_cleaner__cleanup', array( $this, 'cleanup' ) );
+
+        // Do not bother to configure scheduled tasks while running on the front-end.
+        if ( is_admin() && ! wp_next_scheduled( 'wl_ttl_cache_cleaner__cleanup' ) ) {
+            wp_schedule_event( time(), 'hourly', 'wl_ttl_cache_cleaner__cleanup' );
+        }
+
+    }
+
+    public static function deactivate() {
+
+        $timestamp = wp_next_scheduled( 'wl_ttl_cache_cleaner__cleanup' );
+        wp_unschedule_event( $timestamp, 'wl_ttl_cache_cleaner__cleanup' );
+
+    }
+
+    public function cleanup() {
+
+        // Get all the files, recursive.
+        $files = $this->reduce( array(), Ttl_Cache::get_cache_folder() );
+
+
+        // Get the max mtime.
+        $max_mtime = time() - WORDLIFT_CACHE_DEFAULT_TTL;
+
+        // Keep the original count for statistics that we're going to send the client.
+        $original_count = count( $files );
+
+        // Sort by size ascending.
+        usort( $files, function ( $f1, $f2 ) {
+            if ( $f1[ Ttl_Cache_Cleaner::MTIME ] === $f2[ Ttl_Cache_Cleaner::MTIME ] ) {
+                return 0;
+            }
+
+            return ( $f1[ Ttl_Cache_Cleaner::MTIME ] < $f2[ Ttl_Cache_Cleaner::MTIME ] ) ? - 1 : 1;
+        } );
+
+        // Start removing stale files.
+        for ( $i = 0; $i < count( $files ); $i ++ ) {
+            $file = $files[ $i ];
+            // Break if the mtime is within the range.
+            if ( $file[ Ttl_Cache_Cleaner::MTIME ] > $max_mtime ) {
+                break;
+            }
+
+            unset( $files[ $i ] );
+            @unlink( $file[ Ttl_Cache_Cleaner::PATH ] );
+        }
+
+        // Calculate the size.
+        $total_size = array_reduce( $files, function ( $carry, $item ) {
+
+            return $carry + $item[ Ttl_Cache_Cleaner::SIZE ];
+        }, 0 );
+
+
+        // Remove files until we're within the max size.
+        while ( $total_size > $this->max_size ) {
+            $file       = array_shift( $files );
+            $total_size -= $file[ Ttl_Cache_Cleaner::SIZE ];
+            @unlink( $file[ Ttl_Cache_Cleaner::PATH ] );
+        }
+
+        // Send back some stats.
+        wp_send_json_success( array(
+            'initial_count' => $original_count,
+            'current_count' => count( $files ),
+            'current_size'  => $total_size,
+        ) );
+    }
+
+    private function reduce( $accumulator, $path ) {
+
+        /**
+         * Bail out if the path doesn't exist.
+         *
+         * Avoid warnings when trying to open a path which doesn't exist.
+         *
+         * @since 3.23.0
+         * @see https://github.com/insideout10/wordlift-plugin/issues/966
+         */
+        if ( ! file_exists( $path ) ) {
+            return $accumulator;
+        }
+
+        // Open the dir handle.
+        $handle = opendir( $path );
+
+        // Catch exceptions to be sure to close the dir handle.
+        try {
+            $accumulator = @$this->_reduce( $accumulator, $path, $handle );
+        } catch ( Exception $e ) {
+            // Do nothing.
+        }
 
-		// Finally close the directory handle.
-		closedir( $handle );
-
-		return $accumulator;
-	}
-
-	/**
-	 * @param $accumulator
-	 * @param $path
-	 * @param $handle
-	 *
-	 * @return array
-	 */
-	private function _reduce( $accumulator, $path, $handle ) {
-
-		while ( false !== ( $entry = readdir( $handle ) ) ) {
-
-			// Skip to the next one.
-			if ( 0 === strpos( $entry, '.' ) ) {
-				continue;
-			}
-
-			// Set the full path to the entry.
-			$entry_path = $path . DIRECTORY_SEPARATOR . $entry;
-
-			// Handle directories.
-			if ( is_dir( $entry_path ) ) {
-				$accumulator = $this->reduce( $accumulator, $entry_path );
-
-				continue;
-			}
-
-			// Store the file data.
-			$accumulator[] = array(
-				$entry_path,
-				filemtime( $entry_path ),
-				filesize( $entry_path ),
-			);
-		}
-
-		return $accumulator;
-	}
+        // Finally close the directory handle.
+        closedir( $handle );
+
+        return $accumulator;
+    }
+
+    /**
+     * @param $accumulator
+     * @param $path
+     * @param $handle
+     *
+     * @return array
+     */
+    private function _reduce( $accumulator, $path, $handle ) {
+
+        while ( false !== ( $entry = readdir( $handle ) ) ) {
+
+            // Skip to the next one.
+            if ( 0 === strpos( $entry, '.' ) ) {
+                continue;
+            }
+
+            // Set the full path to the entry.
+            $entry_path = $path . DIRECTORY_SEPARATOR . $entry;
+
+            // Handle directories.
+            if ( is_dir( $entry_path ) ) {
+                $accumulator = $this->reduce( $accumulator, $entry_path );
+
+                continue;
+            }
+
+            // Store the file data.
+            $accumulator[] = array(
+                $entry_path,
+                filemtime( $entry_path ),
+                filesize( $entry_path ),
+            );
+        }
+
+        return $accumulator;
+    }
 
 }

Spacing +43 added lines, -43 removed lines

@@ -16,8 +16,8 @@ 
 
 use Exception;
 
-defined( 'WORDLIFT_CACHE_DEFAULT_TTL' ) || define( 'WORDLIFT_CACHE_DEFAULT_TTL', 86400 );  // 24 hours
-defined( 'WORDLIFT_CACHE_DEFAULT_MAX_SIZE' ) || define( 'WORDLIFT_CACHE_DEFAULT_MAX_SIZE', 104857600 ); // 100 M
+defined('WORDLIFT_CACHE_DEFAULT_TTL') || define('WORDLIFT_CACHE_DEFAULT_TTL', 86400); // 24 hours
+defined('WORDLIFT_CACHE_DEFAULT_MAX_SIZE') || define('WORDLIFT_CACHE_DEFAULT_MAX_SIZE', 104857600); // 100 M
 
 class Ttl_Cache_Cleaner {
 
@@ -47,84 +47,84 @@ 
 	 * @param int $ttl The max TTL in seconds.
 	 * @param int $max_size The max size in bytes.
 	 */
-	public function __construct( $ttl = WORDLIFT_CACHE_DEFAULT_TTL, $max_size = WORDLIFT_CACHE_DEFAULT_MAX_SIZE ) {
+	public function __construct($ttl = WORDLIFT_CACHE_DEFAULT_TTL, $max_size = WORDLIFT_CACHE_DEFAULT_MAX_SIZE) {
 
 		$this->ttl      = $ttl;
 		$this->max_size = $max_size;
 
-		add_action( 'wp_ajax_wl_ttl_cache_cleaner__cleanup', array( $this, 'cleanup' ) );
-		add_action( 'wl_ttl_cache_cleaner__cleanup', array( $this, 'cleanup' ) );
+		add_action('wp_ajax_wl_ttl_cache_cleaner__cleanup', array($this, 'cleanup'));
+		add_action('wl_ttl_cache_cleaner__cleanup', array($this, 'cleanup'));
 
 		// Do not bother to configure scheduled tasks while running on the front-end.
-		if ( is_admin() && ! wp_next_scheduled( 'wl_ttl_cache_cleaner__cleanup' ) ) {
-			wp_schedule_event( time(), 'hourly', 'wl_ttl_cache_cleaner__cleanup' );
+		if (is_admin() && ! wp_next_scheduled('wl_ttl_cache_cleaner__cleanup')) {
+			wp_schedule_event(time(), 'hourly', 'wl_ttl_cache_cleaner__cleanup');
 		}
 
 	}
 
 	public static function deactivate() {
 
-		$timestamp = wp_next_scheduled( 'wl_ttl_cache_cleaner__cleanup' );
-		wp_unschedule_event( $timestamp, 'wl_ttl_cache_cleaner__cleanup' );
+		$timestamp = wp_next_scheduled('wl_ttl_cache_cleaner__cleanup');
+		wp_unschedule_event($timestamp, 'wl_ttl_cache_cleaner__cleanup');
 
 	}
 
 	public function cleanup() {
 
 		// Get all the files, recursive.
-		$files = $this->reduce( array(), Ttl_Cache::get_cache_folder() );
+		$files = $this->reduce(array(), Ttl_Cache::get_cache_folder());
 
 
 		// Get the max mtime.
 		$max_mtime = time() - WORDLIFT_CACHE_DEFAULT_TTL;
 
 		// Keep the original count for statistics that we're going to send the client.
-		$original_count = count( $files );
+		$original_count = count($files);
 
 		// Sort by size ascending.
-		usort( $files, function ( $f1, $f2 ) {
-			if ( $f1[ Ttl_Cache_Cleaner::MTIME ] === $f2[ Ttl_Cache_Cleaner::MTIME ] ) {
+		usort($files, function($f1, $f2) {
+			if ($f1[Ttl_Cache_Cleaner::MTIME] === $f2[Ttl_Cache_Cleaner::MTIME]) {
 				return 0;
 			}
 
-			return ( $f1[ Ttl_Cache_Cleaner::MTIME ] < $f2[ Ttl_Cache_Cleaner::MTIME ] ) ? - 1 : 1;
+			return ($f1[Ttl_Cache_Cleaner::MTIME] < $f2[Ttl_Cache_Cleaner::MTIME]) ? -1 : 1;
 		} );
 
 		// Start removing stale files.
-		for ( $i = 0; $i < count( $files ); $i ++ ) {
-			$file = $files[ $i ];
+		for ($i = 0; $i < count($files); $i++) {
+			$file = $files[$i];
 			// Break if the mtime is within the range.
-			if ( $file[ Ttl_Cache_Cleaner::MTIME ] > $max_mtime ) {
+			if ($file[Ttl_Cache_Cleaner::MTIME] > $max_mtime) {
 				break;
 			}
 
-			unset( $files[ $i ] );
-			@unlink( $file[ Ttl_Cache_Cleaner::PATH ] );
+			unset($files[$i]);
+			@unlink($file[Ttl_Cache_Cleaner::PATH]);
 		}
 
 		// Calculate the size.
-		$total_size = array_reduce( $files, function ( $carry, $item ) {
+		$total_size = array_reduce($files, function($carry, $item) {
 
-			return $carry + $item[ Ttl_Cache_Cleaner::SIZE ];
-		}, 0 );
+			return $carry + $item[Ttl_Cache_Cleaner::SIZE];
+		}, 0);
 
 
 		// Remove files until we're within the max size.
-		while ( $total_size > $this->max_size ) {
-			$file       = array_shift( $files );
-			$total_size -= $file[ Ttl_Cache_Cleaner::SIZE ];
-			@unlink( $file[ Ttl_Cache_Cleaner::PATH ] );
+		while ($total_size > $this->max_size) {
+			$file = array_shift($files);
+			$total_size -= $file[Ttl_Cache_Cleaner::SIZE];
+			@unlink($file[Ttl_Cache_Cleaner::PATH]);
 		}
 
 		// Send back some stats.
-		wp_send_json_success( array(
+		wp_send_json_success(array(
 			'initial_count' => $original_count,
-			'current_count' => count( $files ),
+			'current_count' => count($files),
 			'current_size'  => $total_size,
-		) );
+		));
 	}
 
-	private function reduce( $accumulator, $path ) {
+	private function reduce($accumulator, $path) {
 
 		/**
 		 * Bail out if the path doesn't exist.
@@ -134,22 +134,22 @@ 
 		 * @since 3.23.0
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/966
 		 */
-		if ( ! file_exists( $path ) ) {
+		if ( ! file_exists($path)) {
 			return $accumulator;
 		}
 
 		// Open the dir handle.
-		$handle = opendir( $path );
+		$handle = opendir($path);
 
 		// Catch exceptions to be sure to close the dir handle.
 		try {
-			$accumulator = @$this->_reduce( $accumulator, $path, $handle );
-		} catch ( Exception $e ) {
+			$accumulator = @$this->_reduce($accumulator, $path, $handle);
+		} catch (Exception $e) {
 			// Do nothing.
 		}
 
 		// Finally close the directory handle.
-		closedir( $handle );
+		closedir($handle);
 
 		return $accumulator;
 	}
@@ -161,21 +161,21 @@ 
 	 *
 	 * @return array
 	 */
-	private function _reduce( $accumulator, $path, $handle ) {
+	private function _reduce($accumulator, $path, $handle) {
 
-		while ( false !== ( $entry = readdir( $handle ) ) ) {
+		while (false !== ($entry = readdir($handle))) {
 
 			// Skip to the next one.
-			if ( 0 === strpos( $entry, '.' ) ) {
+			if (0 === strpos($entry, '.')) {
 				continue;
 			}
 
 			// Set the full path to the entry.
-			$entry_path = $path . DIRECTORY_SEPARATOR . $entry;
+			$entry_path = $path.DIRECTORY_SEPARATOR.$entry;
 
 			// Handle directories.
-			if ( is_dir( $entry_path ) ) {
-				$accumulator = $this->reduce( $accumulator, $entry_path );
+			if (is_dir($entry_path)) {
+				$accumulator = $this->reduce($accumulator, $entry_path);
 
 				continue;
 			}
@@ -183,8 +183,8 @@ 
 			// Store the file data.
 			$accumulator[] = array(
 				$entry_path,
-				filemtime( $entry_path ),
-				filesize( $entry_path ),
+				filemtime($entry_path),
+				filesize($entry_path),
 			);
 		}
 

src/install/class-wordlift-install-service.php

Indentation +122 added lines, -122 removed lines

@@ -18,141 +18,141 @@
  */
 class Wordlift_Install_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;
-
-	/**
-	 * The singleton instance.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Install_Service $instance A {@link Wordlift_Install_Service} instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Wordlift_Install_Service constructor.
-	 *
-	 * @since 3.18.0
-	 */
-	public function __construct() {
-
-		/** Installs. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-1-0-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-10-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-12-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-14-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-15-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-18-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-18-3.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-19-5.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-20-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-all-entity-types.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-package-type.php';
-
-		self::$instance = $this;
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-	}
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @since 3.18.0
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Loop thought all versions and install the updates.
-	 *
-	 * @return void
-	 * @since 3.18.0
-	 *
-	 * @since 3.20.0 use a transient to avoid concurrent installation calls.
-	 */
-	public function install() {
-
-		if ( false === get_transient( '_wl_installing' ) ) {
-			set_transient( '_wl_installing', true, 5 * MINUTE_IN_SECONDS );
-
-			$this->do_install();
-
-			@delete_transient( '_wl_installing' );
-		}
-
-	}
-
-	/**
-	 * Perform the actual installation.
-	 *
-	 * @since 3.20.0
-	 */
-	private function do_install() {
-
-		// Get the install services.
-		$installs = array(
-			new Wordlift_Install_1_0_0(),
-			new Wordlift_Install_3_10_0(),
-			new Wordlift_Install_3_12_0(),
-			new Wordlift_Install_3_14_0(),
-			new Wordlift_Install_3_15_0(),
-			new Wordlift_Install_3_18_0(),
-			new Wordlift_Install_3_18_3(),
-			new Wordlift_Install_3_19_5(),
-			new Wordlift_Install_3_20_0(),
-			/*
+    /**
+     * 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;
+
+    /**
+     * The singleton instance.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Install_Service $instance A {@link Wordlift_Install_Service} instance.
+     */
+    private static $instance;
+
+    /**
+     * Wordlift_Install_Service constructor.
+     *
+     * @since 3.18.0
+     */
+    public function __construct() {
+
+        /** Installs. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-1-0-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-10-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-12-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-14-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-15-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-18-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-18-3.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-19-5.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-20-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-all-entity-types.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-package-type.php';
+
+        self::$instance = $this;
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+    }
+
+    /**
+     * Get the singleton instance.
+     *
+     * @since 3.18.0
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Loop thought all versions and install the updates.
+     *
+     * @return void
+     * @since 3.18.0
+     *
+     * @since 3.20.0 use a transient to avoid concurrent installation calls.
+     */
+    public function install() {
+
+        if ( false === get_transient( '_wl_installing' ) ) {
+            set_transient( '_wl_installing', true, 5 * MINUTE_IN_SECONDS );
+
+            $this->do_install();
+
+            @delete_transient( '_wl_installing' );
+        }
+
+    }
+
+    /**
+     * Perform the actual installation.
+     *
+     * @since 3.20.0
+     */
+    private function do_install() {
+
+        // Get the install services.
+        $installs = array(
+            new Wordlift_Install_1_0_0(),
+            new Wordlift_Install_3_10_0(),
+            new Wordlift_Install_3_12_0(),
+            new Wordlift_Install_3_14_0(),
+            new Wordlift_Install_3_15_0(),
+            new Wordlift_Install_3_18_0(),
+            new Wordlift_Install_3_18_3(),
+            new Wordlift_Install_3_19_5(),
+            new Wordlift_Install_3_20_0(),
+            /*
 			 * This should be enabled with #852.
 			 */
-			// new Wordlift_Install_All_Entity_Types(),
-			new Wordlift_Install_Package_Type(),
-		);
+            // new Wordlift_Install_All_Entity_Types(),
+            new Wordlift_Install_Package_Type(),
+        );
 
-		$version = null;
+        $version = null;
 
-		/** @var Wordlift_Install $install */
-		foreach ( $installs as $install ) {
-			// Get the install version.
-			$version = $install->get_version();
+        /** @var Wordlift_Install $install */
+        foreach ( $installs as $install ) {
+            // Get the install version.
+            $version = $install->get_version();
 
-			if ( version_compare( $version, $this->get_current_version(), '>' )
-			     || $install->must_install() ) {
+            if ( version_compare( $version, $this->get_current_version(), '>' )
+                 || $install->must_install() ) {
 
-				$class_name = get_class( $install );
+                $class_name = get_class( $install );
 
-				$this->log->info( "Current version is {$this->get_current_version()}, installing $class_name..." );
+                $this->log->info( "Current version is {$this->get_current_version()}, installing $class_name..." );
 
-				// Install version.
-				$install->install();
+                // Install version.
+                $install->install();
 
-				$this->log->info( "$class_name installed." );
+                $this->log->info( "$class_name installed." );
 
-				// Bump the version.
-				update_option( 'wl_db_version', $version );
+                // Bump the version.
+                update_option( 'wl_db_version', $version );
 
-			}
+            }
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Retrieve the current db version.
-	 *
-	 * @return type
-	 */
-	private function get_current_version() {
-		return get_option( 'wl_db_version', '0.0.0' );
-	}
+    /**
+     * Retrieve the current db version.
+     *
+     * @return type
+     */
+    private function get_current_version() {
+        return get_option( 'wl_db_version', '0.0.0' );
+    }
 
 }

Spacing +24 added lines, -24 removed lines

@@ -44,22 +44,22 @@ 
 	public function __construct() {
 
 		/** Installs. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-1-0-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-10-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-12-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-14-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-15-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-18-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-18-3.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-19-5.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-20-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-all-entity-types.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-package-type.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-1-0-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-10-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-12-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-14-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-15-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-18-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-18-3.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-19-5.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-20-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-all-entity-types.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-package-type.php';
 
 		self::$instance = $this;
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 	}
 
@@ -83,12 +83,12 @@ 
 	 */
 	public function install() {
 
-		if ( false === get_transient( '_wl_installing' ) ) {
-			set_transient( '_wl_installing', true, 5 * MINUTE_IN_SECONDS );
+		if (false === get_transient('_wl_installing')) {
+			set_transient('_wl_installing', true, 5 * MINUTE_IN_SECONDS);
 
 			$this->do_install();
 
-			@delete_transient( '_wl_installing' );
+			@delete_transient('_wl_installing');
 		}
 
 	}
@@ -121,24 +121,24 @@ 
 		$version = null;
 
 		/** @var Wordlift_Install $install */
-		foreach ( $installs as $install ) {
+		foreach ($installs as $install) {
 			// Get the install version.
 			$version = $install->get_version();
 
-			if ( version_compare( $version, $this->get_current_version(), '>' )
-			     || $install->must_install() ) {
+			if (version_compare($version, $this->get_current_version(), '>')
+			     || $install->must_install()) {
 
-				$class_name = get_class( $install );
+				$class_name = get_class($install);
 
-				$this->log->info( "Current version is {$this->get_current_version()}, installing $class_name..." );
+				$this->log->info("Current version is {$this->get_current_version()}, installing $class_name...");
 
 				// Install version.
 				$install->install();
 
-				$this->log->info( "$class_name installed." );
+				$this->log->info("$class_name installed.");
 
 				// Bump the version.
-				update_option( 'wl_db_version', $version );
+				update_option('wl_db_version', $version);
 
 			}
 
@@ -152,7 +152,7 @@ 
 	 * @return type
 	 */
 	private function get_current_version() {
-		return get_option( 'wl_db_version', '0.0.0' );
+		return get_option('wl_db_version', '0.0.0');
 	}
 
 }

src/public/class-wordlift-public.php

Indentation +169 added lines, -169 removed lines

@@ -22,107 +22,107 @@ 
  */
 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.
-	 *
-	 * @since    1.0.0
-	 *
-	 * @param      string $plugin_name The name of the plugin.
-	 * @param      string $version The version of this plugin.
-	 */
-	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.
-		 *
-		 * @since 3.19.3
-		 *
-		 * @param bool $include Whether to include or not font-awesome (default true).
-		 */
-		$deps = apply_filters( 'wl_include_font_awesome', true )
-			? array( 'wordlift-font-awesome' )
-			: array();
-		wp_register_style( 'wordlift-font-awesome', plugin_dir_url( dirname( __FILE__ ) ) . 'css/wordlift-font-awesome' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', array(), $this->version, 'all' );
-		wp_register_style( 'wordlift-ui', plugin_dir_url( dirname( __FILE__ ) ) . '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.
+     *
+     * @since    1.0.0
+     *
+     * @param      string $plugin_name The name of the plugin.
+     * @param      string $version The version of this plugin.
+     */
+    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.
+         *
+         * @since 3.19.3
+         *
+         * @param bool $include Whether to include or not font-awesome (default true).
+         */
+        $deps = apply_filters( 'wl_include_font_awesome', true )
+            ? array( 'wordlift-font-awesome' )
+            : array();
+        wp_register_style( 'wordlift-font-awesome', plugin_dir_url( dirname( __FILE__ ) ) . 'css/wordlift-font-awesome' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', array(), $this->version, 'all' );
+        wp_register_style( 'wordlift-ui', plugin_dir_url( dirname( __FILE__ ) ) . '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
 		 *
@@ -131,81 +131,81 @@ 
 		 * @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 );
+        $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,
-			) );
-		}
+        if($show_version) {
+            wp_localize_script( $this->plugin_name, 'wordlift', array(
+                'version' => $this->version,
+            ) );
+        }
 
-		/*
+        /*
 		 * Register wordlift-cloud script which is shared by
 		 * Context Cards and Navigator
 		 *
 		 * @since 3.22.0
 		 *
 		 */
-		wp_register_script( 'wordlift-cloud', plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/wordlift-cloud.js', array(), false, true );
-
-	}
-
-	/**
-	 * Get the settings array.
-	 *
-	 * @since 3.19.1
-	 *
-	 * @return array An array with the settings.
-	 */
-	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/' ),
-		);
-
-		// 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;
-		}
-
-		// 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.
-	 *
-	 * @since 3.19.4
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/842.
-	 *
-	 * @return string The URL to the public JavaScript.
-	 */
-	public static function get_public_js_url() {
-
-		return plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/bundle.js';
-	}
+        wp_register_script( 'wordlift-cloud', plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/wordlift-cloud.js', array(), false, true );
+
+    }
+
+    /**
+     * Get the settings array.
+     *
+     * @since 3.19.1
+     *
+     * @return array An array with the settings.
+     */
+    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/' ),
+        );
+
+        // 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;
+        }
+
+        // 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.
+     *
+     * @since 3.19.4
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/842.
+     *
+     * @return string The URL to the public JavaScript.
+     */
+    public static function get_public_js_url() {
+
+        return plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/bundle.js';
+    }
 
 }

Spacing +19 added lines, -19 removed lines

@@ -48,7 +48,7 @@ 
 	 * @param      string $plugin_name The name of the plugin.
 	 * @param      string $version The version of this plugin.
 	 */
-	public function __construct( $plugin_name, $version ) {
+	public function __construct($plugin_name, $version) {
 
 		$this->plugin_name = $plugin_name;
 		$this->version     = $version;
@@ -82,11 +82,11 @@ 
 		 *
 		 * @param bool $include Whether to include or not font-awesome (default true).
 		 */
-		$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( dirname( __FILE__ ) ) . 'css/wordlift-font-awesome' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', array(), $this->version, 'all' );
-		wp_register_style( 'wordlift-ui', plugin_dir_url( dirname( __FILE__ ) ) . 'css/wordlift-ui' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', $deps, $this->version, 'all' );
+		wp_register_style('wordlift-font-awesome', plugin_dir_url(dirname(__FILE__)).'css/wordlift-font-awesome'.( ! defined('SCRIPT_DEBUG') || ! SCRIPT_DEBUG ? '.min' : '').'.css', array(), $this->version, 'all');
+		wp_register_style('wordlift-ui', plugin_dir_url(dirname(__FILE__)).'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.
 		//
@@ -119,8 +119,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.
@@ -132,12 +132,12 @@ 
 		 * @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) {
-			wp_localize_script( $this->plugin_name, 'wordlift', array(
+		if ($show_version) {
+			wp_localize_script($this->plugin_name, 'wordlift', array(
 				'version' => $this->version,
-			) );
+			));
 		}
 
 		/*
@@ -147,7 +147,7 @@ 
 		 * @since 3.22.0
 		 *
 		 */
-		wp_register_script( 'wordlift-cloud', plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/wordlift-cloud.js', array(), false, true );
+		wp_register_script('wordlift-cloud', plugin_dir_url(dirname(__FILE__)).'js/dist/wordlift-cloud.js', array(), false, true);
 
 	}
 
@@ -162,17 +162,17 @@ 
 
 		// Prepare a settings array for client-side functions.
 		$settings = array(
-			'ajaxUrl' => admin_url( 'admin-ajax.php' ),
-			'apiUrl'  => get_home_url( null, 'wl-api/' ),
+			'ajaxUrl' => admin_url('admin-ajax.php'),
+			'apiUrl'  => get_home_url(null, 'wl-api/'),
 		);
 
 		// 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;
 		}
 
@@ -180,13 +180,13 @@ 
 		// `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() );
+		$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 );
+		$settings['jsonld_enabled'] = apply_filters('wl_jsonld_enabled', $jsonld_enabled);
 
 		return $settings;
 	}
@@ -205,7 +205,7 @@ 
 	 */
 	public static function get_public_js_url() {
 
-		return plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/bundle.js';
+		return plugin_dir_url(dirname(__FILE__)).'js/dist/bundle.js';
 	}
 
 }

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

Indentation +135 added lines, -135 removed lines

@@ -17,140 +17,140 @@ 
  */
 class Wordlift_Navigator_Shortcode extends Wordlift_Shortcode {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	const SHORTCODE = 'wl_navigator';
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function render( $atts ) {
-
-		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
-			: $this->web_shortcode( $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 ASC'
-		), $atts );
-
-		return $shortcode_atts;
-	}
-
-	/**
-	 * Function in charge of diplaying 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 );
-
-		// 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();
-		$navigator_id = $shortcode_atts['uniqid'];
-		$rest_url     = $post ? admin_url( sprintf( 'admin-ajax.php?action=wl_navigator&uniqid=%s&post_id=%s&limit=%s&offset=%s&order_by=%s', $navigator_id, $post->ID, $shortcode_atts['limit'], $shortcode_atts['offset'], $shortcode_atts['order_by'] ) ) : false;
-
-		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
-			return;
-		}
-
-		wp_enqueue_script( 'wordlift-cloud' );
-		$json_navigator_id = json_encode( $navigator_id );
-		wp_add_inline_script( 'wordlift-cloud', "window.wlNavigators = window.wlNavigators || []; wlNavigators.push( $json_navigator_id );" );
-
-		return sprintf(
-			'<div id="%s" class="%s" data-rest-url="%s" data-title="%s" data-template-id="%s" data-limit="%s"></div>',
-			$navigator_id,
-			'wl-navigator',
-			$rest_url,
-			$shortcode_atts['title'],
-			$shortcode_atts['template_id'],
-			$shortcode_atts['limit']
-		);
-	}
-
-	/**
-	 * 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 there is a list of posts.
-		if ( ! is_singular() ) {
-			return '';
-		}
-
-		$current_post = get_post();
-
-		// Enqueue amp specific styles
-		wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( dirname( __FILE__ ) ) . '/css/wordlift-amp-custom.min.css' );
-
-		$post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $shortcode_atts['post_id'] ) ) : get_post();
-		$navigator_id = $shortcode_atts['uniqid'];
-
-		$wp_json_base = get_rest_url() . WL_REST_ROUTE_DEFAULT_NAMESPACE;
-
-		$navigator_query = array(
-			'uniqid'  => $navigator_id,
-			'post_id' => $post->ID,
-			'limit'   => $shortcode_atts['limit'],
-			'offset'  => $shortcode_atts['offset'],
-			'order_by'=> 'ID ASC'
-		);
-
-		if ( strpos( $wp_json_base, 'wp-json/' . WL_REST_ROUTE_DEFAULT_NAMESPACE ) ) {
-			$delimiter = '?';
-		} else {
-			$delimiter = '&';
-		}
-
-		// 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
-		$wp_json_url_posts = str_replace( array(
-				'http:',
-				'https:',
-			), '', $wp_json_base ) . '/navigator' . $delimiter . http_build_query( $navigator_query );
-
-		return <<<HTML
+    /**
+     * {@inheritdoc}
+     */
+    const SHORTCODE = 'wl_navigator';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function render( $atts ) {
+
+        return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
+            : $this->web_shortcode( $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 ASC'
+        ), $atts );
+
+        return $shortcode_atts;
+    }
+
+    /**
+     * Function in charge of diplaying 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 );
+
+        // 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();
+        $navigator_id = $shortcode_atts['uniqid'];
+        $rest_url     = $post ? admin_url( sprintf( 'admin-ajax.php?action=wl_navigator&uniqid=%s&post_id=%s&limit=%s&offset=%s&order_by=%s', $navigator_id, $post->ID, $shortcode_atts['limit'], $shortcode_atts['offset'], $shortcode_atts['order_by'] ) ) : false;
+
+        // avoid building the widget when no valid $rest_url
+        if ( ! $rest_url ) {
+            return;
+        }
+
+        wp_enqueue_script( 'wordlift-cloud' );
+        $json_navigator_id = json_encode( $navigator_id );
+        wp_add_inline_script( 'wordlift-cloud', "window.wlNavigators = window.wlNavigators || []; wlNavigators.push( $json_navigator_id );" );
+
+        return sprintf(
+            '<div id="%s" class="%s" data-rest-url="%s" data-title="%s" data-template-id="%s" data-limit="%s"></div>',
+            $navigator_id,
+            'wl-navigator',
+            $rest_url,
+            $shortcode_atts['title'],
+            $shortcode_atts['template_id'],
+            $shortcode_atts['limit']
+        );
+    }
+
+    /**
+     * 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 there is a list of posts.
+        if ( ! is_singular() ) {
+            return '';
+        }
+
+        $current_post = get_post();
+
+        // Enqueue amp specific styles
+        wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( dirname( __FILE__ ) ) . '/css/wordlift-amp-custom.min.css' );
+
+        $post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $shortcode_atts['post_id'] ) ) : get_post();
+        $navigator_id = $shortcode_atts['uniqid'];
+
+        $wp_json_base = get_rest_url() . WL_REST_ROUTE_DEFAULT_NAMESPACE;
+
+        $navigator_query = array(
+            'uniqid'  => $navigator_id,
+            'post_id' => $post->ID,
+            'limit'   => $shortcode_atts['limit'],
+            'offset'  => $shortcode_atts['offset'],
+            'order_by'=> 'ID ASC'
+        );
+
+        if ( strpos( $wp_json_base, 'wp-json/' . WL_REST_ROUTE_DEFAULT_NAMESPACE ) ) {
+            $delimiter = '?';
+        } else {
+            $delimiter = '&';
+        }
+
+        // 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
+        $wp_json_url_posts = str_replace( array(
+                'http:',
+                'https:',
+            ), '', $wp_json_base ) . '/navigator' . $delimiter . http_build_query( $navigator_query );
+
+        return <<<HTML
 		<div id="{$navigator_id}" class="wl-navigator-widget" style="width: 100%">
 			<h3 class="wl-headline">{$shortcode_atts['title']}</h3>
 			<amp-list 
@@ -207,6 +207,6 @@ 
 			</amp-list>	
 		</div>
 HTML;
-	}
+    }
 
 }

Spacing +26 added lines, -26 removed lines

@@ -25,10 +25,10 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function render( $atts ) {
+	public function render($atts) {
 
-		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
-			: $this->web_shortcode( $atts );
+		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode($atts)
+			: $this->web_shortcode($atts);
 	}
 
 	/**
@@ -41,18 +41,18 @@ 
 	 * @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' ),
+		$shortcode_atts = shortcode_atts(array(
+			'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 ASC'
-		), $atts );
+		), $atts);
 
 		return $shortcode_atts;
 	}
@@ -66,28 +66,28 @@ 
 	 * @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();
+		$post         = ! empty($shortcode_atts['post_id']) ? get_post(intval($shortcode_atts['post_id'])) : get_post();
 		$navigator_id = $shortcode_atts['uniqid'];
-		$rest_url     = $post ? admin_url( sprintf( 'admin-ajax.php?action=wl_navigator&uniqid=%s&post_id=%s&limit=%s&offset=%s&order_by=%s', $navigator_id, $post->ID, $shortcode_atts['limit'], $shortcode_atts['offset'], $shortcode_atts['order_by'] ) ) : false;
+		$rest_url     = $post ? admin_url(sprintf('admin-ajax.php?action=wl_navigator&uniqid=%s&post_id=%s&limit=%s&offset=%s&order_by=%s', $navigator_id, $post->ID, $shortcode_atts['limit'], $shortcode_atts['offset'], $shortcode_atts['order_by'])) : false;
 
 		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
+		if ( ! $rest_url) {
 			return;
 		}
 
-		wp_enqueue_script( 'wordlift-cloud' );
-		$json_navigator_id = json_encode( $navigator_id );
-		wp_add_inline_script( 'wordlift-cloud', "window.wlNavigators = window.wlNavigators || []; wlNavigators.push( $json_navigator_id );" );
+		wp_enqueue_script('wordlift-cloud');
+		$json_navigator_id = json_encode($navigator_id);
+		wp_add_inline_script('wordlift-cloud', "window.wlNavigators = window.wlNavigators || []; wlNavigators.push( $json_navigator_id );");
 
 		return sprintf(
 			'<div id="%s" class="%s" data-rest-url="%s" data-title="%s" data-template-id="%s" data-limit="%s"></div>',
@@ -109,25 +109,25 @@ 
 	 * @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 there is a list of posts.
-		if ( ! is_singular() ) {
+		if ( ! is_singular()) {
 			return '';
 		}
 
 		$current_post = get_post();
 
 		// Enqueue amp specific styles
-		wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( dirname( __FILE__ ) ) . '/css/wordlift-amp-custom.min.css' );
+		wp_enqueue_style('wordlift-amp-custom', plugin_dir_url(dirname(__FILE__)).'/css/wordlift-amp-custom.min.css');
 
-		$post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $shortcode_atts['post_id'] ) ) : get_post();
+		$post         = ! empty($shortcode_atts['post_id']) ? get_post(intval($shortcode_atts['post_id'])) : get_post();
 		$navigator_id = $shortcode_atts['uniqid'];
 
-		$wp_json_base = get_rest_url() . WL_REST_ROUTE_DEFAULT_NAMESPACE;
+		$wp_json_base = get_rest_url().WL_REST_ROUTE_DEFAULT_NAMESPACE;
 
 		$navigator_query = array(
 			'uniqid'  => $navigator_id,
@@ -137,7 +137,7 @@ 
 			'order_by'=> 'ID ASC'
 		);
 
-		if ( strpos( $wp_json_base, 'wp-json/' . WL_REST_ROUTE_DEFAULT_NAMESPACE ) ) {
+		if (strpos($wp_json_base, 'wp-json/'.WL_REST_ROUTE_DEFAULT_NAMESPACE)) {
 			$delimiter = '?';
 		} else {
 			$delimiter = '&';
@@ -145,10 +145,10 @@ 
 
 		// 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
-		$wp_json_url_posts = str_replace( array(
+		$wp_json_url_posts = str_replace(array(
 				'http:',
 				'https:',
-			), '', $wp_json_base ) . '/navigator' . $delimiter . http_build_query( $navigator_query );
+			), '', $wp_json_base).'/navigator'.$delimiter.http_build_query($navigator_query);
 
 		return <<<HTML
 		<div id="{$navigator_id}" class="wl-navigator-widget" style="width: 100%">

src/shortcodes/wordlift_shortcode_navigator.php

Indentation +263 added lines, -263 removed lines

@@ -16,29 +16,29 @@ 
  */
 function wl_shortcode_navigator_data() {
 
-	// Create the cache key.
-	$cache_key_params = $_REQUEST;
-	unset( $cache_key_params['uniqid'] );
-	$cache_key = array( 'request_params' => $cache_key_params );
+    // Create the cache key.
+    $cache_key_params = $_REQUEST;
+    unset( $cache_key_params['uniqid'] );
+    $cache_key = array( 'request_params' => $cache_key_params );
 
-	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "navigator", 24 * 60 * 60 ); // 24 hours.
-	$cache_results = $cache->get( $cache_key );
+    // Create the TTL cache and try to get the results.
+    $cache         = new Ttl_Cache( "navigator", 24 * 60 * 60 ); // 24 hours.
+    $cache_results = $cache->get( $cache_key );
 
-	if ( isset( $cache_results ) ) {
-		header( 'X-WordLift-Cache: HIT' );
+    if ( isset( $cache_results ) ) {
+        header( 'X-WordLift-Cache: HIT' );
 
-		return $cache_results;
-	}
+        return $cache_results;
+    }
 
-	header( 'X-WordLift-Cache: MISS' );
+    header( 'X-WordLift-Cache: MISS' );
 
-	$results = _wl_navigator_get_data();
+    $results = _wl_navigator_get_data();
 
-	// Put the result before sending the json to the client, since sending the json will terminate us.
-	$cache->put( $cache_key, $results );
+    // Put the result before sending the json to the client, since sending the json will terminate us.
+    $cache->put( $cache_key, $results );
 
-	return $results;
+    return $results;
 }
 
 /**
@@ -53,187 +53,187 @@ 
  */
 function wl_network_navigator_wp_json($request) {
 
-	// Create the cache key.
-	$cache_key_params = $_REQUEST;
-	unset( $cache_key_params['uniqid'] );
-	$cache_key = array( 'request_params' => $cache_key_params );
+    // Create the cache key.
+    $cache_key_params = $_REQUEST;
+    unset( $cache_key_params['uniqid'] );
+    $cache_key = array( 'request_params' => $cache_key_params );
 
-	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "network-navigator", 24 * 60 * 60 ); // 24 hours.
-	$cache_results = $cache->get( $cache_key );
+    // Create the TTL cache and try to get the results.
+    $cache         = new Ttl_Cache( "network-navigator", 24 * 60 * 60 ); // 24 hours.
+    $cache_results = $cache->get( $cache_key );
 
-	if ( isset( $cache_results ) ) {
-		header( 'X-WordLift-Cache: HIT' );
+    if ( isset( $cache_results ) ) {
+        header( 'X-WordLift-Cache: HIT' );
 
-		return $cache_results;
-	}
+        return $cache_results;
+    }
 
-	header( 'X-WordLift-Cache: MISS' );
+    header( 'X-WordLift-Cache: MISS' );
 
-	$results = _wl_network_navigator_get_data($request);
+    $results = _wl_network_navigator_get_data($request);
 
-	// Put the result before sending the json to the client, since sending the json will terminate us.
-	$cache->put( $cache_key, $results );
+    // Put the result before sending the json to the client, since sending the json will terminate us.
+    $cache->put( $cache_key, $results );
 
-	return $results;
+    return $results;
 
 }
 
 function _wl_navigator_get_data() {
 
-	// Post ID must be defined
-	if ( ! isset( $_GET['post_id'] ) ) {
-		wp_send_json_error( 'No post_id given' );
-
-		return array();
-	}
-
-	// Limit the results (defaults to 4)
-	$navigator_length = isset( $_GET['limit'] ) ? intval( $_GET['limit'] ) : 4;
-	$navigator_offset = isset( $_GET['offset'] ) ? intval( $_GET['offset'] ) : 0;
-	$order_by         = isset( $_GET['order_by'] ) ? sanitize_sql_orderby($_GET['order_by']) : 'ID ASC';
-
-	$current_post_id = $_GET['post_id'];
-	$current_post    = get_post( $current_post_id );
-
-	$navigator_id = $_GET['uniqid'];
-
-	// Post ID has to match an existing item
-	if ( null === $current_post ) {
-		wp_send_json_error( 'No valid post_id given' );
-
-		return array();
-	}
-
-	$referencing_posts = _wl_navigator_get_results( $current_post_id, array(
-		'ID',
-		'post_title',
-	), $order_by, $navigator_length, $navigator_offset );
-
-	// loop over them and take the first one which is not already in the $related_posts
-	$results = array();
-	foreach ( $referencing_posts as $referencing_post ) {
-		$serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
-
-		/**
-		 * Use the thumbnail.
-		 *
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/837
-		 *
-		 * @since 3.19.3 We're using the medium size image.
-		 */
-		$thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
-
-		$result = array(
-			'post'   => array(
-				'permalink' => get_permalink( $referencing_post->ID ),
-				'title'     => $referencing_post->post_title,
-				'thumbnail' => $thumbnail,
-			),
-			'entity' => array(
-				'label'     => $serialized_entity['label'],
-				'mainType'  => $serialized_entity['mainType'],
-				'permalink' => get_permalink( $referencing_post->entity_id ),
-			),
-		);
-
-		$result['post']   = apply_filters( 'wl_navigator_data_post', $result['post'], intval( $referencing_post->ID ), $navigator_id );
-		$result['entity'] = apply_filters( 'wl_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
-
-		$results[] = $result;
-	}
-
-	if ( count( $results ) < $navigator_length ) {
-		$results = apply_filters( 'wl_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
-	}
-
-	return $results;
+    // Post ID must be defined
+    if ( ! isset( $_GET['post_id'] ) ) {
+        wp_send_json_error( 'No post_id given' );
+
+        return array();
+    }
+
+    // Limit the results (defaults to 4)
+    $navigator_length = isset( $_GET['limit'] ) ? intval( $_GET['limit'] ) : 4;
+    $navigator_offset = isset( $_GET['offset'] ) ? intval( $_GET['offset'] ) : 0;
+    $order_by         = isset( $_GET['order_by'] ) ? sanitize_sql_orderby($_GET['order_by']) : 'ID ASC';
+
+    $current_post_id = $_GET['post_id'];
+    $current_post    = get_post( $current_post_id );
+
+    $navigator_id = $_GET['uniqid'];
+
+    // Post ID has to match an existing item
+    if ( null === $current_post ) {
+        wp_send_json_error( 'No valid post_id given' );
+
+        return array();
+    }
+
+    $referencing_posts = _wl_navigator_get_results( $current_post_id, array(
+        'ID',
+        'post_title',
+    ), $order_by, $navigator_length, $navigator_offset );
+
+    // loop over them and take the first one which is not already in the $related_posts
+    $results = array();
+    foreach ( $referencing_posts as $referencing_post ) {
+        $serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
+
+        /**
+         * Use the thumbnail.
+         *
+         * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
+         * @see https://github.com/insideout10/wordlift-plugin/issues/837
+         *
+         * @since 3.19.3 We're using the medium size image.
+         */
+        $thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
+
+        $result = array(
+            'post'   => array(
+                'permalink' => get_permalink( $referencing_post->ID ),
+                'title'     => $referencing_post->post_title,
+                'thumbnail' => $thumbnail,
+            ),
+            'entity' => array(
+                'label'     => $serialized_entity['label'],
+                'mainType'  => $serialized_entity['mainType'],
+                'permalink' => get_permalink( $referencing_post->entity_id ),
+            ),
+        );
+
+        $result['post']   = apply_filters( 'wl_navigator_data_post', $result['post'], intval( $referencing_post->ID ), $navigator_id );
+        $result['entity'] = apply_filters( 'wl_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
+
+        $results[] = $result;
+    }
+
+    if ( count( $results ) < $navigator_length ) {
+        $results = apply_filters( 'wl_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
+    }
+
+    return $results;
 }
 
 function _wl_network_navigator_get_data($request) {
 
-	// Limit the results (defaults to 4)
-	$navigator_length = isset( $request['limit'] ) ? intval( $request['limit'] ) : 4;
-	$navigator_offset = isset( $request['offset'] ) ? intval( $request['offset'] ) : 0;
-	$navigator_id     = $request['uniqid'];
-	$order_by         = isset( $_GET['order_by'] ) ? sanitize_sql_orderby($_GET['order_by']) : 'ID ASC';
-
-	$entities = $request['entities'];
-
-	// Post ID has to match an existing item
-	if ( !isset($entities) || empty($entities) ) {
-		wp_send_json_error( 'No valid entities provided' );
-	}
-
-	$referencing_posts = _wl_network_navigator_get_results( $entities, array(
-		'ID',
-		'post_title',
-	), $order_by, $navigator_length, $navigator_offset );
-
-	// loop over them and take the first one which is not already in the $related_posts
-	$results = array();
-	foreach ( $referencing_posts as $referencing_post ) {
-		$serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
-
-		/**
-		 * Use the thumbnail.
-		 *
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/837
-		 *
-		 * @since 3.19.3 We're using the medium size image.
-		 */
-		$thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
-
-		$result = array(
-			'post'   => array(
-				'permalink' => get_permalink( $referencing_post->ID ),
-				'title'     => $referencing_post->post_title,
-				'thumbnail' => $thumbnail,
-			),
-			'entity' => array(
-				'label'     => $serialized_entity['label'],
-				'mainType'  => $serialized_entity['mainType'],
-				'permalink' => get_permalink( $referencing_post->entity_id ),
-			),
-		);
-
-		$result['post']   = apply_filters( 'wl_network_navigator_data_post', $result['post'], intval( $referencing_post->ID ), $navigator_id );
-		$result['entity'] = apply_filters( 'wl_network_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
-
-		$results[] = $result;
-
-	}
-
-	if ( count( $results ) < $navigator_length ) {
-		$results = apply_filters( 'wl_network_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
-	}
-
-	return $results;
+    // Limit the results (defaults to 4)
+    $navigator_length = isset( $request['limit'] ) ? intval( $request['limit'] ) : 4;
+    $navigator_offset = isset( $request['offset'] ) ? intval( $request['offset'] ) : 0;
+    $navigator_id     = $request['uniqid'];
+    $order_by         = isset( $_GET['order_by'] ) ? sanitize_sql_orderby($_GET['order_by']) : 'ID ASC';
+
+    $entities = $request['entities'];
+
+    // Post ID has to match an existing item
+    if ( !isset($entities) || empty($entities) ) {
+        wp_send_json_error( 'No valid entities provided' );
+    }
+
+    $referencing_posts = _wl_network_navigator_get_results( $entities, array(
+        'ID',
+        'post_title',
+    ), $order_by, $navigator_length, $navigator_offset );
+
+    // loop over them and take the first one which is not already in the $related_posts
+    $results = array();
+    foreach ( $referencing_posts as $referencing_post ) {
+        $serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
+
+        /**
+         * Use the thumbnail.
+         *
+         * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
+         * @see https://github.com/insideout10/wordlift-plugin/issues/837
+         *
+         * @since 3.19.3 We're using the medium size image.
+         */
+        $thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
+
+        $result = array(
+            'post'   => array(
+                'permalink' => get_permalink( $referencing_post->ID ),
+                'title'     => $referencing_post->post_title,
+                'thumbnail' => $thumbnail,
+            ),
+            'entity' => array(
+                'label'     => $serialized_entity['label'],
+                'mainType'  => $serialized_entity['mainType'],
+                'permalink' => get_permalink( $referencing_post->entity_id ),
+            ),
+        );
+
+        $result['post']   = apply_filters( 'wl_network_navigator_data_post', $result['post'], intval( $referencing_post->ID ), $navigator_id );
+        $result['entity'] = apply_filters( 'wl_network_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
+
+        $results[] = $result;
+
+    }
+
+    if ( count( $results ) < $navigator_length ) {
+        $results = apply_filters( 'wl_network_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
+    }
+
+    return $results;
 
 }
 
 
 function _wl_navigator_get_results(
-	$post_id, $fields = array(
-	'ID',
-	'post_title',
+    $post_id, $fields = array(
+    'ID',
+    'post_title',
 ), $order_by = 'ID DESC', $limit = 10, $offset = 0
 ) {
-	global $wpdb;
+    global $wpdb;
 
-	$select = implode( ', ', array_map( function ( $item ) {
-		return "p.$item AS $item";
-	}, (array) $fields ) );
+    $select = implode( ', ', array_map( function ( $item ) {
+        return "p.$item AS $item";
+    }, (array) $fields ) );
 
-	$order_by = implode( ', ', array_map( function ( $item ) {
-		return "p.$item";
-	}, (array) $order_by ) );
+    $order_by = implode( ', ', array_map( function ( $item ) {
+        return "p.$item";
+    }, (array) $order_by ) );
 
-	/** @noinspection SqlNoDataSourceInspection */
-	return $wpdb->get_results(
-		$wpdb->prepare( <<<EOF
+    /** @noinspection SqlNoDataSourceInspection */
+    return $wpdb->get_results(
+        $wpdb->prepare( <<<EOF
 SELECT %4\$s, p2.ID as entity_id
  FROM {$wpdb->prefix}wl_relation_instances r1
     INNER JOIN {$wpdb->prefix}wl_relation_instances r2
@@ -265,35 +265,35 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 EOF
-			, $post_id, $limit, $offset, $select, $order_by )
-	);
+            , $post_id, $limit, $offset, $select, $order_by )
+    );
 
 }
 
 function _wl_network_navigator_get_results(
-	$entities, $fields = array(
-	'ID',
-	'post_title',
+    $entities, $fields = array(
+    'ID',
+    'post_title',
 ), $order_by = 'ID DESC', $limit = 10, $offset = 0
 ) {
-	global $wpdb;
+    global $wpdb;
 
-	$select = implode( ', ', array_map( function ( $item ) {
-		return "p.$item AS $item";
-	}, (array) $fields ) );
+    $select = implode( ', ', array_map( function ( $item ) {
+        return "p.$item AS $item";
+    }, (array) $fields ) );
 
-	$order_by = implode( ', ', array_map( function ( $item ) {
-		return "p.$item";
-	}, (array) $order_by ) );
+    $order_by = implode( ', ', array_map( function ( $item ) {
+        return "p.$item";
+    }, (array) $order_by ) );
 
-	$entities_in = implode( ',', array_map( function ( $item ) {
-		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri(urldecode($item));
-		if(isset($entity)) return $entity->ID;
-	}, $entities ) );
+    $entities_in = implode( ',', array_map( function ( $item ) {
+        $entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri(urldecode($item));
+        if(isset($entity)) return $entity->ID;
+    }, $entities ) );
 
-	/** @noinspection SqlNoDataSourceInspection */
-	return $wpdb->get_results(
-		$wpdb->prepare( <<<EOF
+    /** @noinspection SqlNoDataSourceInspection */
+    return $wpdb->get_results(
+        $wpdb->prepare( <<<EOF
 SELECT %3\$s, p2.ID as entity_id
  FROM {$wpdb->prefix}wl_relation_instances r1
 	-- get the ID of the post entity in common between the object and the subject 2. 
@@ -319,8 +319,8 @@ 
  LIMIT %1\$d
  OFFSET %2\$d
 EOF
-			, $limit, $offset, $select, $order_by )
-	);
+            , $limit, $offset, $select, $order_by )
+    );
 
 }
 
@@ -331,9 +331,9 @@ 
  */
 function wl_shortcode_navigator_ajax() {
 
-	// Temporary blocking the Navigator.
-	$results = wl_shortcode_navigator_data();
-	wl_core_send_json( $results );
+    // Temporary blocking the Navigator.
+    $results = wl_shortcode_navigator_data();
+    wl_core_send_json( $results );
 
 }
 
@@ -345,16 +345,16 @@ 
  */
 function wl_shortcode_navigator_wp_json() {
 
-	$results = wl_shortcode_navigator_data();
-	if ( ob_get_contents() ) {
-		ob_clean();
-	}
+    $results = wl_shortcode_navigator_data();
+    if ( ob_get_contents() ) {
+        ob_clean();
+    }
 
-	return array(
-		'items' => array(
-			array( 'values' => $results ),
-		),
-	);
+    return array(
+        'items' => array(
+            array( 'values' => $results ),
+        ),
+    );
 
 }
 
@@ -362,66 +362,66 @@ 
  * Adding `rest_api_init` action for amp backend of navigator
  */
 add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
-		'methods'  => 'GET',
-		'callback' => 'wl_shortcode_navigator_wp_json',
-	) );
+    register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
+        'methods'  => 'GET',
+        'callback' => 'wl_shortcode_navigator_wp_json',
+    ) );
 } );
 
 /**
  * Adding `rest_api_init` action for backend of network navigator
  */
 add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/network-navigator', array(
-		'methods'  => 'GET',
-		'callback' => 'wl_network_navigator_wp_json',
-	) );
+    register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/network-navigator', array(
+        'methods'  => 'GET',
+        'callback' => 'wl_network_navigator_wp_json',
+    ) );
 } );
 
 /**
  * register_block_type for Gutenberg blocks
  */
 add_action( 'init', function () {
-	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
-		return;
-	}
-
-	register_block_type( 'wordlift/navigator', array(
-		'editor_script'   => 'wordlift-admin-edit-gutenberg',
-		'render_callback' => function ( $attributes ) {
-			$attr_code = '';
-			foreach ( $attributes as $key => $value ) {
-				$attr_code .= $key . '="' . $value . '" ';
-			}
-
-			return '[wl_navigator ' . $attr_code . ']';
-		},
-		'attributes'      => array(
-			'title'       => array(
-				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' ),
-			),
-			'limit'       => array(
-				'type'    => 'number',
-				'default' => 4,
-			),
-			'template_id' => array(
-				'type' => 'string',
-			),
-			'post_id'     => array(
-				'type' => 'number',
-			),
-			'offset'      => array(
-				'type'    => 'number',
-				'default' => 0,
-			),
-			'uniqid'      => array(
-				'type'    => 'string',
-				'default' => uniqid( 'wl-navigator-widget-' ),
-			),
-		),
-	) );
+    // Bail out if the `register_block_type` function isn't available.
+    if ( ! function_exists( 'register_block_type' ) ) {
+        return;
+    }
+
+    register_block_type( 'wordlift/navigator', array(
+        'editor_script'   => 'wordlift-admin-edit-gutenberg',
+        'render_callback' => function ( $attributes ) {
+            $attr_code = '';
+            foreach ( $attributes as $key => $value ) {
+                $attr_code .= $key . '="' . $value . '" ';
+            }
+
+            return '[wl_navigator ' . $attr_code . ']';
+        },
+        'attributes'      => array(
+            'title'       => array(
+                'type'    => 'string',
+                'default' => __( 'Related articles', 'wordlift' ),
+            ),
+            'limit'       => array(
+                'type'    => 'number',
+                'default' => 4,
+            ),
+            'template_id' => array(
+                'type' => 'string',
+            ),
+            'post_id'     => array(
+                'type' => 'number',
+            ),
+            'offset'      => array(
+                'type'    => 'number',
+                'default' => 0,
+            ),
+            'uniqid'      => array(
+                'type'    => 'string',
+                'default' => uniqid( 'wl-navigator-widget-' ),
+            ),
+        ),
+    ) );
 } );
 
 /**
@@ -431,22 +431,22 @@ 
  */
 add_action( 'plugins_loaded', function () {
 
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
-		return;
-	}
+    if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
+        return;
+    }
 
-	remove_action( 'plugins_loaded', 'rocket_init' );
-	remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
-	remove_action( 'plugins_loaded', 'wpseo_init', 14 );
+    remove_action( 'plugins_loaded', 'rocket_init' );
+    remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
+    remove_action( 'plugins_loaded', 'wpseo_init', 14 );
 }, 0 );
 
 add_action( 'init', function () {
 
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
-		return;
-	}
+    if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
+        return;
+    }
 
-	remove_action( 'init', 'wp_widgets_init', 1 );
-	remove_action( 'init', 'gglcptch_init' );
+    remove_action( 'init', 'wp_widgets_init', 1 );
+    remove_action( 'init', 'gglcptch_init' );
 }, 0 );
 

Spacing +98 added lines, -98 removed lines

@@ -18,25 +18,25 @@ 
 
 	// Create the cache key.
 	$cache_key_params = $_REQUEST;
-	unset( $cache_key_params['uniqid'] );
-	$cache_key = array( 'request_params' => $cache_key_params );
+	unset($cache_key_params['uniqid']);
+	$cache_key = array('request_params' => $cache_key_params);
 
 	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "navigator", 24 * 60 * 60 ); // 24 hours.
-	$cache_results = $cache->get( $cache_key );
+	$cache         = new Ttl_Cache("navigator", 24 * 60 * 60); // 24 hours.
+	$cache_results = $cache->get($cache_key);
 
-	if ( isset( $cache_results ) ) {
-		header( 'X-WordLift-Cache: HIT' );
+	if (isset($cache_results)) {
+		header('X-WordLift-Cache: HIT');
 
 		return $cache_results;
 	}
 
-	header( 'X-WordLift-Cache: MISS' );
+	header('X-WordLift-Cache: MISS');
 
 	$results = _wl_navigator_get_data();
 
 	// Put the result before sending the json to the client, since sending the json will terminate us.
-	$cache->put( $cache_key, $results );
+	$cache->put($cache_key, $results);
 
 	return $results;
 }
@@ -55,25 +55,25 @@ 
 
 	// Create the cache key.
 	$cache_key_params = $_REQUEST;
-	unset( $cache_key_params['uniqid'] );
-	$cache_key = array( 'request_params' => $cache_key_params );
+	unset($cache_key_params['uniqid']);
+	$cache_key = array('request_params' => $cache_key_params);
 
 	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "network-navigator", 24 * 60 * 60 ); // 24 hours.
-	$cache_results = $cache->get( $cache_key );
+	$cache         = new Ttl_Cache("network-navigator", 24 * 60 * 60); // 24 hours.
+	$cache_results = $cache->get($cache_key);
 
-	if ( isset( $cache_results ) ) {
-		header( 'X-WordLift-Cache: HIT' );
+	if (isset($cache_results)) {
+		header('X-WordLift-Cache: HIT');
 
 		return $cache_results;
 	}
 
-	header( 'X-WordLift-Cache: MISS' );
+	header('X-WordLift-Cache: MISS');
 
 	$results = _wl_network_navigator_get_data($request);
 
 	// Put the result before sending the json to the client, since sending the json will terminate us.
-	$cache->put( $cache_key, $results );
+	$cache->put($cache_key, $results);
 
 	return $results;
 
@@ -82,38 +82,38 @@ 
 function _wl_navigator_get_data() {
 
 	// Post ID must be defined
-	if ( ! isset( $_GET['post_id'] ) ) {
-		wp_send_json_error( 'No post_id given' );
+	if ( ! isset($_GET['post_id'])) {
+		wp_send_json_error('No post_id given');
 
 		return array();
 	}
 
 	// Limit the results (defaults to 4)
-	$navigator_length = isset( $_GET['limit'] ) ? intval( $_GET['limit'] ) : 4;
-	$navigator_offset = isset( $_GET['offset'] ) ? intval( $_GET['offset'] ) : 0;
-	$order_by         = isset( $_GET['order_by'] ) ? sanitize_sql_orderby($_GET['order_by']) : 'ID ASC';
+	$navigator_length = isset($_GET['limit']) ? intval($_GET['limit']) : 4;
+	$navigator_offset = isset($_GET['offset']) ? intval($_GET['offset']) : 0;
+	$order_by         = isset($_GET['order_by']) ? sanitize_sql_orderby($_GET['order_by']) : 'ID ASC';
 
 	$current_post_id = $_GET['post_id'];
-	$current_post    = get_post( $current_post_id );
+	$current_post    = get_post($current_post_id);
 
 	$navigator_id = $_GET['uniqid'];
 
 	// Post ID has to match an existing item
-	if ( null === $current_post ) {
-		wp_send_json_error( 'No valid post_id given' );
+	if (null === $current_post) {
+		wp_send_json_error('No valid post_id given');
 
 		return array();
 	}
 
-	$referencing_posts = _wl_navigator_get_results( $current_post_id, array(
+	$referencing_posts = _wl_navigator_get_results($current_post_id, array(
 		'ID',
 		'post_title',
-	), $order_by, $navigator_length, $navigator_offset );
+	), $order_by, $navigator_length, $navigator_offset);
 
 	// loop over them and take the first one which is not already in the $related_posts
 	$results = array();
-	foreach ( $referencing_posts as $referencing_post ) {
-		$serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
+	foreach ($referencing_posts as $referencing_post) {
+		$serialized_entity = wl_serialize_entity($referencing_post->entity_id);
 
 		/**
 		 * Use the thumbnail.
@@ -123,29 +123,29 @@ 
 		 *
 		 * @since 3.19.3 We're using the medium size image.
 		 */
-		$thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
+		$thumbnail = get_the_post_thumbnail_url($referencing_post, 'medium');
 
 		$result = array(
 			'post'   => array(
-				'permalink' => get_permalink( $referencing_post->ID ),
+				'permalink' => get_permalink($referencing_post->ID),
 				'title'     => $referencing_post->post_title,
 				'thumbnail' => $thumbnail,
 			),
 			'entity' => array(
 				'label'     => $serialized_entity['label'],
 				'mainType'  => $serialized_entity['mainType'],
-				'permalink' => get_permalink( $referencing_post->entity_id ),
+				'permalink' => get_permalink($referencing_post->entity_id),
 			),
 		);
 
-		$result['post']   = apply_filters( 'wl_navigator_data_post', $result['post'], intval( $referencing_post->ID ), $navigator_id );
-		$result['entity'] = apply_filters( 'wl_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
+		$result['post']   = apply_filters('wl_navigator_data_post', $result['post'], intval($referencing_post->ID), $navigator_id);
+		$result['entity'] = apply_filters('wl_navigator_data_entity', $result['entity'], intval($referencing_post->entity_id), $navigator_id);
 
 		$results[] = $result;
 	}
 
-	if ( count( $results ) < $navigator_length ) {
-		$results = apply_filters( 'wl_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
+	if (count($results) < $navigator_length) {
+		$results = apply_filters('wl_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length);
 	}
 
 	return $results;
@@ -154,27 +154,27 @@ 
 function _wl_network_navigator_get_data($request) {
 
 	// Limit the results (defaults to 4)
-	$navigator_length = isset( $request['limit'] ) ? intval( $request['limit'] ) : 4;
-	$navigator_offset = isset( $request['offset'] ) ? intval( $request['offset'] ) : 0;
+	$navigator_length = isset($request['limit']) ? intval($request['limit']) : 4;
+	$navigator_offset = isset($request['offset']) ? intval($request['offset']) : 0;
 	$navigator_id     = $request['uniqid'];
-	$order_by         = isset( $_GET['order_by'] ) ? sanitize_sql_orderby($_GET['order_by']) : 'ID ASC';
+	$order_by         = isset($_GET['order_by']) ? sanitize_sql_orderby($_GET['order_by']) : 'ID ASC';
 
 	$entities = $request['entities'];
 
 	// Post ID has to match an existing item
-	if ( !isset($entities) || empty($entities) ) {
-		wp_send_json_error( 'No valid entities provided' );
+	if ( ! isset($entities) || empty($entities)) {
+		wp_send_json_error('No valid entities provided');
 	}
 
-	$referencing_posts = _wl_network_navigator_get_results( $entities, array(
+	$referencing_posts = _wl_network_navigator_get_results($entities, array(
 		'ID',
 		'post_title',
-	), $order_by, $navigator_length, $navigator_offset );
+	), $order_by, $navigator_length, $navigator_offset);
 
 	// loop over them and take the first one which is not already in the $related_posts
 	$results = array();
-	foreach ( $referencing_posts as $referencing_post ) {
-		$serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
+	foreach ($referencing_posts as $referencing_post) {
+		$serialized_entity = wl_serialize_entity($referencing_post->entity_id);
 
 		/**
 		 * Use the thumbnail.
@@ -184,30 +184,30 @@ 
 		 *
 		 * @since 3.19.3 We're using the medium size image.
 		 */
-		$thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
+		$thumbnail = get_the_post_thumbnail_url($referencing_post, 'medium');
 
 		$result = array(
 			'post'   => array(
-				'permalink' => get_permalink( $referencing_post->ID ),
+				'permalink' => get_permalink($referencing_post->ID),
 				'title'     => $referencing_post->post_title,
 				'thumbnail' => $thumbnail,
 			),
 			'entity' => array(
 				'label'     => $serialized_entity['label'],
 				'mainType'  => $serialized_entity['mainType'],
-				'permalink' => get_permalink( $referencing_post->entity_id ),
+				'permalink' => get_permalink($referencing_post->entity_id),
 			),
 		);
 
-		$result['post']   = apply_filters( 'wl_network_navigator_data_post', $result['post'], intval( $referencing_post->ID ), $navigator_id );
-		$result['entity'] = apply_filters( 'wl_network_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
+		$result['post']   = apply_filters('wl_network_navigator_data_post', $result['post'], intval($referencing_post->ID), $navigator_id);
+		$result['entity'] = apply_filters('wl_network_navigator_data_entity', $result['entity'], intval($referencing_post->entity_id), $navigator_id);
 
 		$results[] = $result;
 
 	}
 
-	if ( count( $results ) < $navigator_length ) {
-		$results = apply_filters( 'wl_network_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
+	if (count($results) < $navigator_length) {
+		$results = apply_filters('wl_network_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length);
 	}
 
 	return $results;
@@ -223,17 +223,17 @@ 
 ) {
 	global $wpdb;
 
-	$select = implode( ', ', array_map( function ( $item ) {
+	$select = implode(', ', array_map(function($item) {
 		return "p.$item AS $item";
-	}, (array) $fields ) );
+	}, (array) $fields));
 
-	$order_by = implode( ', ', array_map( function ( $item ) {
+	$order_by = implode(', ', array_map(function($item) {
 		return "p.$item";
-	}, (array) $order_by ) );
+	}, (array) $order_by));
 
 	/** @noinspection SqlNoDataSourceInspection */
 	return $wpdb->get_results(
-		$wpdb->prepare( <<<EOF
+		$wpdb->prepare(<<<EOF
 SELECT %4\$s, p2.ID as entity_id
  FROM {$wpdb->prefix}wl_relation_instances r1
     INNER JOIN {$wpdb->prefix}wl_relation_instances r2
@@ -265,7 +265,7 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 EOF
-			, $post_id, $limit, $offset, $select, $order_by )
+			, $post_id, $limit, $offset, $select, $order_by)
 	);
 
 }
@@ -278,22 +278,22 @@ 
 ) {
 	global $wpdb;
 
-	$select = implode( ', ', array_map( function ( $item ) {
+	$select = implode(', ', array_map(function($item) {
 		return "p.$item AS $item";
-	}, (array) $fields ) );
+	}, (array) $fields));
 
-	$order_by = implode( ', ', array_map( function ( $item ) {
+	$order_by = implode(', ', array_map(function($item) {
 		return "p.$item";
-	}, (array) $order_by ) );
+	}, (array) $order_by));
 
-	$entities_in = implode( ',', array_map( function ( $item ) {
+	$entities_in = implode(',', array_map(function($item) {
 		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri(urldecode($item));
-		if(isset($entity)) return $entity->ID;
-	}, $entities ) );
+		if (isset($entity)) return $entity->ID;
+	}, $entities));
 
 	/** @noinspection SqlNoDataSourceInspection */
 	return $wpdb->get_results(
-		$wpdb->prepare( <<<EOF
+		$wpdb->prepare(<<<EOF
 SELECT %3\$s, p2.ID as entity_id
  FROM {$wpdb->prefix}wl_relation_instances r1
 	-- get the ID of the post entity in common between the object and the subject 2. 
@@ -319,7 +319,7 @@ 
  LIMIT %1\$d
  OFFSET %2\$d
 EOF
-			, $limit, $offset, $select, $order_by )
+			, $limit, $offset, $select, $order_by)
 	);
 
 }
@@ -333,12 +333,12 @@ 
 
 	// Temporary blocking the Navigator.
 	$results = wl_shortcode_navigator_data();
-	wl_core_send_json( $results );
+	wl_core_send_json($results);
 
 }
 
-add_action( 'wp_ajax_wl_navigator', 'wl_shortcode_navigator_ajax' );
-add_action( 'wp_ajax_nopriv_wl_navigator', 'wl_shortcode_navigator_ajax' );
+add_action('wp_ajax_wl_navigator', 'wl_shortcode_navigator_ajax');
+add_action('wp_ajax_nopriv_wl_navigator', 'wl_shortcode_navigator_ajax');
 
 /**
  * wp-json call for the navigator widget
@@ -346,13 +346,13 @@ 
 function wl_shortcode_navigator_wp_json() {
 
 	$results = wl_shortcode_navigator_data();
-	if ( ob_get_contents() ) {
+	if (ob_get_contents()) {
 		ob_clean();
 	}
 
 	return array(
 		'items' => array(
-			array( 'values' => $results ),
+			array('values' => $results),
 		),
 	);
 
@@ -361,46 +361,46 @@ 
 /**
  * Adding `rest_api_init` action for amp backend of navigator
  */
-add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
+add_action('rest_api_init', function() {
+	register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
 		'methods'  => 'GET',
 		'callback' => 'wl_shortcode_navigator_wp_json',
-	) );
+	));
 } );
 
 /**
  * Adding `rest_api_init` action for backend of network navigator
  */
-add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/network-navigator', array(
+add_action('rest_api_init', function() {
+	register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/network-navigator', array(
 		'methods'  => 'GET',
 		'callback' => 'wl_network_navigator_wp_json',
-	) );
+	));
 } );
 
 /**
  * register_block_type for Gutenberg blocks
  */
-add_action( 'init', function () {
+add_action('init', function() {
 	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
+	if ( ! function_exists('register_block_type')) {
 		return;
 	}
 
-	register_block_type( 'wordlift/navigator', array(
+	register_block_type('wordlift/navigator', array(
 		'editor_script'   => 'wordlift-admin-edit-gutenberg',
-		'render_callback' => function ( $attributes ) {
+		'render_callback' => function($attributes) {
 			$attr_code = '';
-			foreach ( $attributes as $key => $value ) {
-				$attr_code .= $key . '="' . $value . '" ';
+			foreach ($attributes as $key => $value) {
+				$attr_code .= $key.'="'.$value.'" ';
 			}
 
-			return '[wl_navigator ' . $attr_code . ']';
+			return '[wl_navigator '.$attr_code.']';
 		},
 		'attributes'      => array(
 			'title'       => array(
 				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' ),
+				'default' => __('Related articles', 'wordlift'),
 			),
 			'limit'       => array(
 				'type'    => 'number',
@@ -418,10 +418,10 @@ 
 			),
 			'uniqid'      => array(
 				'type'    => 'string',
-				'default' => uniqid( 'wl-navigator-widget-' ),
+				'default' => uniqid('wl-navigator-widget-'),
 			),
 		),
-	) );
+	));
 } );
 
 /**
@@ -429,24 +429,24 @@ 
  *
  * @since 2.2.0
  */
-add_action( 'plugins_loaded', function () {
+add_action('plugins_loaded', function() {
 
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
+	if ( ! defined('DOING_AJAX') || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action']) {
 		return;
 	}
 
-	remove_action( 'plugins_loaded', 'rocket_init' );
-	remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
-	remove_action( 'plugins_loaded', 'wpseo_init', 14 );
-}, 0 );
+	remove_action('plugins_loaded', 'rocket_init');
+	remove_action('plugins_loaded', 'wpseo_premium_init', 14);
+	remove_action('plugins_loaded', 'wpseo_init', 14);
+}, 0);
 
-add_action( 'init', function () {
+add_action('init', function() {
 
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
+	if ( ! defined('DOING_AJAX') || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action']) {
 		return;
 	}
 
-	remove_action( 'init', 'wp_widgets_init', 1 );
-	remove_action( 'init', 'gglcptch_init' );
-}, 0 );
+	remove_action('init', 'wp_widgets_init', 1);
+	remove_action('init', 'gglcptch_init');
+}, 0);
 

Braces +3 added lines, -1 removed lines

@@ -288,7 +288,9 @@
 
 	$entities_in = implode( ',', array_map( function ( $item ) {
 		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri(urldecode($item));
-		if(isset($entity)) return $entity->ID;
+		if(isset($entity)) {
+		    return $entity->ID;
+		}
 	}, $entities ) );
 
 	/** @noinspection SqlNoDataSourceInspection */