insideout10 / wordlift-plugin

src/wordlift/task/class-all-posts-task.php

Indentation +88 added lines, -88 removed lines

@@ -11,94 +11,94 @@
 
 class All_Posts_Task implements Task {
 
-	private $callable;
-
-	/**
-	 * @var string|null
-	 */
-	private $post_type;
-
-	/**
-	 * @var string|null
-	 */
-	private $id;
-
-	public function __construct( $callable, $post_type = null, $id = null ) {
-		$this->callable  = $callable;
-		$this->post_type = $post_type;
-		$this->id        = $id;
-	}
-
-	public function get_id() {
-		return isset( $this->id ) ? $this->id : sha1( get_class( $this ) );
-	}
-
-	public function starting() {
-		global $wpdb;
-
-		// Try to get the count from transient, or load it from database.
-		$key   = $this->get_transient_key();
-		$count = get_transient( $key );
-		if ( false === $count ) {
-			$count = $wpdb->get_var(
-				"SELECT COUNT( 1 ) 
+    private $callable;
+
+    /**
+     * @var string|null
+     */
+    private $post_type;
+
+    /**
+     * @var string|null
+     */
+    private $id;
+
+    public function __construct( $callable, $post_type = null, $id = null ) {
+        $this->callable  = $callable;
+        $this->post_type = $post_type;
+        $this->id        = $id;
+    }
+
+    public function get_id() {
+        return isset( $this->id ) ? $this->id : sha1( get_class( $this ) );
+    }
+
+    public function starting() {
+        global $wpdb;
+
+        // Try to get the count from transient, or load it from database.
+        $key   = $this->get_transient_key();
+        $count = get_transient( $key );
+        if ( false === $count ) {
+            $count = $wpdb->get_var(
+                "SELECT COUNT( 1 ) 
 				FROM $wpdb->posts "
-				. $this->where( $this->add_post_type_filter() ) );
-			set_transient( $key, $count, HOUR_IN_SECONDS );
-		}
-
-		return $count;
-	}
-
-	/**
-	 * @param $value mixed The incoming value.
-	 * @param $args {
-	 *
-	 * @type int $offset The index of the current item.
-	 * @type int $count The total number of items as provided by the `starting` function.
-	 * @type int $batch_size The number of items to process within this call.
-	 * }
-	 *
-	 * @return void
-	 */
-	public function tick( $value, $args ) {
-		global $wpdb;
-
-		$ids = $wpdb->get_col(
-			$wpdb->prepare(
-				"SELECT ID FROM $wpdb->posts "
-				. $this->where( $this->add_post_type_filter() )
-				. " ORDER BY ID LIMIT %d,%d",
-				$args['offset'],
-				$args['batch_size']
-			)
-		);
-
-		foreach ( $ids as $id ) {
-			call_user_func( $this->callable, $id );
-		}
-
-	}
-
-	private function add_post_type_filter() {
-		global $wpdb;
-		if ( isset( $this->post_type ) ) {
-			return $wpdb->prepare( ' post_type = %s ', $this->post_type );
-		}
-
-		return '';
-	}
-
-	private function where( $filter ) {
-		if ( ! empty( $filter ) ) {
-			return " WHERE $filter";
-		}
-
-		return '';
-	}
-
-	private function get_transient_key() {
-		return '_wl_task__all_posts_task__count' . ( isset( $this->post_type ) ? '__' . $this->post_type : '' );
-	}
+                . $this->where( $this->add_post_type_filter() ) );
+            set_transient( $key, $count, HOUR_IN_SECONDS );
+        }
+
+        return $count;
+    }
+
+    /**
+     * @param $value mixed The incoming value.
+     * @param $args {
+     *
+     * @type int $offset The index of the current item.
+     * @type int $count The total number of items as provided by the `starting` function.
+     * @type int $batch_size The number of items to process within this call.
+     * }
+     *
+     * @return void
+     */
+    public function tick( $value, $args ) {
+        global $wpdb;
+
+        $ids = $wpdb->get_col(
+            $wpdb->prepare(
+                "SELECT ID FROM $wpdb->posts "
+                . $this->where( $this->add_post_type_filter() )
+                . " ORDER BY ID LIMIT %d,%d",
+                $args['offset'],
+                $args['batch_size']
+            )
+        );
+
+        foreach ( $ids as $id ) {
+            call_user_func( $this->callable, $id );
+        }
+
+    }
+
+    private function add_post_type_filter() {
+        global $wpdb;
+        if ( isset( $this->post_type ) ) {
+            return $wpdb->prepare( ' post_type = %s ', $this->post_type );
+        }
+
+        return '';
+    }
+
+    private function where( $filter ) {
+        if ( ! empty( $filter ) ) {
+            return " WHERE $filter";
+        }
+
+        return '';
+    }
+
+    private function get_transient_key() {
+        return '_wl_task__all_posts_task__count' . ( isset( $this->post_type ) ? '__' . $this->post_type : '' );
+    }
 
 }

Spacing +15 added lines, -15 removed lines

@@ -23,14 +23,14 @@ 
 	 */
 	private $id;
 
-	public function __construct( $callable, $post_type = null, $id = null ) {
+	public function __construct($callable, $post_type = null, $id = null) {
 		$this->callable  = $callable;
 		$this->post_type = $post_type;
 		$this->id        = $id;
 	}
 
 	public function get_id() {
-		return isset( $this->id ) ? $this->id : sha1( get_class( $this ) );
+		return isset($this->id) ? $this->id : sha1(get_class($this));
 	}
 
 	public function starting() {
@@ -38,13 +38,13 @@ 
 
 		// Try to get the count from transient, or load it from database.
 		$key   = $this->get_transient_key();
-		$count = get_transient( $key );
-		if ( false === $count ) {
+		$count = get_transient($key);
+		if (false === $count) {
 			$count = $wpdb->get_var(
 				"SELECT COUNT( 1 ) 
 				FROM $wpdb->posts "
-				. $this->where( $this->add_post_type_filter() ) );
-			set_transient( $key, $count, HOUR_IN_SECONDS );
+				. $this->where($this->add_post_type_filter()) );
+			set_transient($key, $count, HOUR_IN_SECONDS);
 		}
 
 		return $count;
@@ -61,36 +61,36 @@ 
 	 *
 	 * @return void
 	 */
-	public function tick( $value, $args ) {
+	public function tick($value, $args) {
 		global $wpdb;
 
 		$ids = $wpdb->get_col(
 			$wpdb->prepare(
 				"SELECT ID FROM $wpdb->posts "
-				. $this->where( $this->add_post_type_filter() )
+				. $this->where($this->add_post_type_filter())
 				. " ORDER BY ID LIMIT %d,%d",
 				$args['offset'],
 				$args['batch_size']
 			)
 		);
 
-		foreach ( $ids as $id ) {
-			call_user_func( $this->callable, $id );
+		foreach ($ids as $id) {
+			call_user_func($this->callable, $id);
 		}
 
 	}
 
 	private function add_post_type_filter() {
 		global $wpdb;
-		if ( isset( $this->post_type ) ) {
-			return $wpdb->prepare( ' post_type = %s ', $this->post_type );
+		if (isset($this->post_type)) {
+			return $wpdb->prepare(' post_type = %s ', $this->post_type);
 		}
 
 		return '';
 	}
 
-	private function where( $filter ) {
-		if ( ! empty( $filter ) ) {
+	private function where($filter) {
+		if ( ! empty($filter)) {
 			return " WHERE $filter";
 		}
 
@@ -98,7 +98,7 @@ 
 	}
 
 	private function get_transient_key() {
-		return '_wl_task__all_posts_task__count' . ( isset( $this->post_type ) ? '__' . $this->post_type : '' );
+		return '_wl_task__all_posts_task__count'.(isset($this->post_type) ? '__'.$this->post_type : '');
 	}
 
 }

src/wordlift/task/background/class-background-task.php

Indentation +114 added lines, -114 removed lines

@@ -7,119 +7,119 @@
 
 class Background_Task extends Wordlift_Plugin_WP_Background_Process {
 
-	const STATE_STARTED = 'started';
-	const STATE_STOPPED = 'stopped';
-
-	/**
-	 * The current state of the task, started or stopped.
-	 *
-	 * @var Background_Task_State $state
-	 */
-	private $state;
-
-	/**
-	 * The actual task.
-	 *
-	 * @var Task $task
-	 */
-	private $task;
-
-	/**
-	 * The prefix to store the state and other information in WP's options table, determined at instantiation.
-	 *
-	 * @var string $option_prefix
-	 */
-	private $option_prefix;
-
-	/**
-	 * @param Task $task
-	 */
-	public function __construct( $task ) {
-		$this->action        = $task->get_id();
-		$this->option_prefix = "_{$this->action}_";
-
-		parent::__construct();
-
-		// Set the current state.
-		if ( self::STATE_STARTED === $this->get_state() ) {
-			$this->state = new Background_Task_Started_State( $this, $task );
-		} else {
-			$this->state = new Background_Task_Stopped_State( $this );
-		}
-
-		$this->task = $task;
-	}
-
-	public static function create( $task ) {
-		return new self( $task );
-	}
-
-	public function get_option_prefix() {
-		return $this->option_prefix;
-	}
-
-	/**
-	 * This function is called:
-	 *  - To start a new Synchronization, by passing a {@link Sync_Start_Message} instance.
-	 *  - To synchronize a post, by passing a numeric ID.
-	 *
-	 * This function returns the parameter for the next call or NULL if there are no more posts to process.
-	 *
-	 * @param mixed $item Queue item to iterate over.
-	 *
-	 * @return int[]|false The next post IDs or false if there are no more.
-	 */
-	protected function task( $item ) {
-
-		return $this->state->task( $item );
-	}
-
-	/**
-	 * Transition to the started state.
-	 */
-	public function start() {
-		$this->state->leave();
-		$this->state = new Background_Task_Started_State( $this, $this->task );
-		$this->state->enter();
-	}
-
-	/**
-	 * Transition to the stopped state.
-	 */
-	public function stop() {
-		$this->state->leave();
-		$this->state = new Background_Task_Stopped_State( $this );
-		$this->state->enter();
-	}
-
-	public function resume() {
-		$this->state->resume();
-	}
-
-	/**
-	 * Get the current state.
-	 *
-	 * @return string Either self::STARTED_STATE or self::STOPPED_STATE (default).
-	 */
-	public function get_state() {
-		return get_option( $this->option_prefix . 'state', self::STATE_STOPPED );
-	}
-
-	/**
-	 * Persist the current state.
-	 *
-	 * @param string $value
-	 *
-	 * @return bool
-	 */
-	public function set_state( $value ) {
-		return null === $value
-			? delete_option( $this->option_prefix . 'state' )
-			: update_option( $this->option_prefix . 'state', $value, true );
-	}
-
-	public function get_info() {
-		return $this->state->get_info();
-	}
+    const STATE_STARTED = 'started';
+    const STATE_STOPPED = 'stopped';
+
+    /**
+     * The current state of the task, started or stopped.
+     *
+     * @var Background_Task_State $state
+     */
+    private $state;
+
+    /**
+     * The actual task.
+     *
+     * @var Task $task
+     */
+    private $task;
+
+    /**
+     * The prefix to store the state and other information in WP's options table, determined at instantiation.
+     *
+     * @var string $option_prefix
+     */
+    private $option_prefix;
+
+    /**
+     * @param Task $task
+     */
+    public function __construct( $task ) {
+        $this->action        = $task->get_id();
+        $this->option_prefix = "_{$this->action}_";
+
+        parent::__construct();
+
+        // Set the current state.
+        if ( self::STATE_STARTED === $this->get_state() ) {
+            $this->state = new Background_Task_Started_State( $this, $task );
+        } else {
+            $this->state = new Background_Task_Stopped_State( $this );
+        }
+
+        $this->task = $task;
+    }
+
+    public static function create( $task ) {
+        return new self( $task );
+    }
+
+    public function get_option_prefix() {
+        return $this->option_prefix;
+    }
+
+    /**
+     * This function is called:
+     *  - To start a new Synchronization, by passing a {@link Sync_Start_Message} instance.
+     *  - To synchronize a post, by passing a numeric ID.
+     *
+     * This function returns the parameter for the next call or NULL if there are no more posts to process.
+     *
+     * @param mixed $item Queue item to iterate over.
+     *
+     * @return int[]|false The next post IDs or false if there are no more.
+     */
+    protected function task( $item ) {
+
+        return $this->state->task( $item );
+    }
+
+    /**
+     * Transition to the started state.
+     */
+    public function start() {
+        $this->state->leave();
+        $this->state = new Background_Task_Started_State( $this, $this->task );
+        $this->state->enter();
+    }
+
+    /**
+     * Transition to the stopped state.
+     */
+    public function stop() {
+        $this->state->leave();
+        $this->state = new Background_Task_Stopped_State( $this );
+        $this->state->enter();
+    }
+
+    public function resume() {
+        $this->state->resume();
+    }
+
+    /**
+     * Get the current state.
+     *
+     * @return string Either self::STARTED_STATE or self::STOPPED_STATE (default).
+     */
+    public function get_state() {
+        return get_option( $this->option_prefix . 'state', self::STATE_STOPPED );
+    }
+
+    /**
+     * Persist the current state.
+     *
+     * @param string $value
+     *
+     * @return bool
+     */
+    public function set_state( $value ) {
+        return null === $value
+            ? delete_option( $this->option_prefix . 'state' )
+            : update_option( $this->option_prefix . 'state', $value, true );
+    }
+
+    public function get_info() {
+        return $this->state->get_info();
+    }
 
 }

Spacing +14 added lines, -14 removed lines

@@ -34,24 +34,24 @@ 
 	/**
 	 * @param Task $task
 	 */
-	public function __construct( $task ) {
+	public function __construct($task) {
 		$this->action        = $task->get_id();
 		$this->option_prefix = "_{$this->action}_";
 
 		parent::__construct();
 
 		// Set the current state.
-		if ( self::STATE_STARTED === $this->get_state() ) {
-			$this->state = new Background_Task_Started_State( $this, $task );
+		if (self::STATE_STARTED === $this->get_state()) {
+			$this->state = new Background_Task_Started_State($this, $task);
 		} else {
-			$this->state = new Background_Task_Stopped_State( $this );
+			$this->state = new Background_Task_Stopped_State($this);
 		}
 
 		$this->task = $task;
 	}
 
-	public static function create( $task ) {
-		return new self( $task );
+	public static function create($task) {
+		return new self($task);
 	}
 
 	public function get_option_prefix() {
@@ -69,9 +69,9 @@ 
 	 *
 	 * @return int[]|false The next post IDs or false if there are no more.
 	 */
-	protected function task( $item ) {
+	protected function task($item) {
 
-		return $this->state->task( $item );
+		return $this->state->task($item);
 	}
 
 	/**
@@ -79,7 +79,7 @@ 
 	 */
 	public function start() {
 		$this->state->leave();
-		$this->state = new Background_Task_Started_State( $this, $this->task );
+		$this->state = new Background_Task_Started_State($this, $this->task);
 		$this->state->enter();
 	}
 
@@ -88,7 +88,7 @@ 
 	 */
 	public function stop() {
 		$this->state->leave();
-		$this->state = new Background_Task_Stopped_State( $this );
+		$this->state = new Background_Task_Stopped_State($this);
 		$this->state->enter();
 	}
 
@@ -102,7 +102,7 @@ 
 	 * @return string Either self::STARTED_STATE or self::STOPPED_STATE (default).
 	 */
 	public function get_state() {
-		return get_option( $this->option_prefix . 'state', self::STATE_STOPPED );
+		return get_option($this->option_prefix.'state', self::STATE_STOPPED);
 	}
 
 	/**
@@ -112,10 +112,10 @@ 
 	 *
 	 * @return bool
 	 */
-	public function set_state( $value ) {
+	public function set_state($value) {
 		return null === $value
-			? delete_option( $this->option_prefix . 'state' )
-			: update_option( $this->option_prefix . 'state', $value, true );
+			? delete_option($this->option_prefix.'state')
+			: update_option($this->option_prefix.'state', $value, true);
 	}
 
 	public function get_info() {

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

Indentation +165 added lines, -165 removed lines

@@ -18,172 +18,172 @@
  */
 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;
-
-	/**
-	 * @var array
-	 */
-	private $installs;
-
-	/**
-	 * Wordlift_Install_Service constructor.
-	 *
-	 * @since 3.18.0
-	 */
-	public function __construct() {
-
-		/** Installs. */
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-1-0-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-10-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-12-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-14-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-15-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-18-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-18-3.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-19-5.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-20-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-23-4.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-24-2.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-all-entity-types.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-package-type.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-25-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-27-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-27-1.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-28-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-32-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-33-9.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-36-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-38-5.php';
-		// Get the install services.
-		$this->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;
+
+    /**
+     * @var array
+     */
+    private $installs;
+
+    /**
+     * Wordlift_Install_Service constructor.
+     *
+     * @since 3.18.0
+     */
+    public function __construct() {
+
+        /** Installs. */
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-1-0-0.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-10-0.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-12-0.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-14-0.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-15-0.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-18-0.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-18-3.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-19-5.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-20-0.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-23-4.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-24-2.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-all-entity-types.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-package-type.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-25-0.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-27-0.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-27-1.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-28-0.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-32-0.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-33-9.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-36-0.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-38-5.php';
+        // Get the install services.
+        $this->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_Package_Type(),
-			new Wordlift_Install_3_23_4(),
-			new Wordlift_Install_3_24_2(),
-			new Wordlift_Install_3_25_0(),
-			new Wordlift_Install_3_27_0(),
-			new Wordlift_Install_3_27_1(),
-			new Wordlift_Install_3_28_0(),
-			// Add column to represent term
-			new Wordlift_Install_3_32_0(),
-			// Add the entities table.
-			new Wordlift_Install_3_33_9(),
-			// When woocommerce extension installed, acf4so should be installed automatically.
-			new Wordlift_Install_3_36_0(),
-
-			new Wordlift_Install_3_38_5(),
-		);
-		self::$instance = $this;
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		add_action( 'init', array( $this, 'install' ) );
-
-	}
-
-	/**
-	 * 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() {
-
-		$version = null;
-
-		if ( $this->install_required() && false === get_transient( '_wl_installing' ) ) {
-			set_transient( '_wl_installing', true, 5 * MINUTE_IN_SECONDS );
-			/** @var Wordlift_Install $install */
-			foreach ( $this->installs as $install ) {
-				// Get the install version.
-				$version = $install->get_version();
-
-				if ( version_compare( $version, $this->get_current_version(), '>' )
-					 || $install->must_install() ) {
-					$class_name = get_class( $install );
-
-					$this->log->info( "Current version is {$this->get_current_version()}, installing $class_name..." );
-					// Install version.
-					$install->install();
-
-					$this->log->info( "$class_name installed." );
-
-					// Bump the version.
-					update_option( 'wl_db_version', $version );
-				}
-			}
-
-			// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
-			@delete_transient( '_wl_installing' );
-
-		}
-
-	}
-
-	private function install_required() {
-
-		/** @var Wordlift_Install $install */
-		foreach ( $this->installs as $install ) {
-			// Get the install version.
-			$version = $install->get_version();
-
-			if ( version_compare( $version, $this->get_current_version(), '>' )
-				 || $install->must_install() ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Retrieve the current db version.
-	 *
-	 * @return type
-	 */
-	private function get_current_version() {
-		return get_option( 'wl_db_version', '0.0.0' );
-	}
+            new Wordlift_Install_Package_Type(),
+            new Wordlift_Install_3_23_4(),
+            new Wordlift_Install_3_24_2(),
+            new Wordlift_Install_3_25_0(),
+            new Wordlift_Install_3_27_0(),
+            new Wordlift_Install_3_27_1(),
+            new Wordlift_Install_3_28_0(),
+            // Add column to represent term
+            new Wordlift_Install_3_32_0(),
+            // Add the entities table.
+            new Wordlift_Install_3_33_9(),
+            // When woocommerce extension installed, acf4so should be installed automatically.
+            new Wordlift_Install_3_36_0(),
+
+            new Wordlift_Install_3_38_5(),
+        );
+        self::$instance = $this;
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        add_action( 'init', array( $this, 'install' ) );
+
+    }
+
+    /**
+     * 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() {
+
+        $version = null;
+
+        if ( $this->install_required() && false === get_transient( '_wl_installing' ) ) {
+            set_transient( '_wl_installing', true, 5 * MINUTE_IN_SECONDS );
+            /** @var Wordlift_Install $install */
+            foreach ( $this->installs as $install ) {
+                // Get the install version.
+                $version = $install->get_version();
+
+                if ( version_compare( $version, $this->get_current_version(), '>' )
+                     || $install->must_install() ) {
+                    $class_name = get_class( $install );
+
+                    $this->log->info( "Current version is {$this->get_current_version()}, installing $class_name..." );
+                    // Install version.
+                    $install->install();
+
+                    $this->log->info( "$class_name installed." );
+
+                    // Bump the version.
+                    update_option( 'wl_db_version', $version );
+                }
+            }
+
+            // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
+            @delete_transient( '_wl_installing' );
+
+        }
+
+    }
+
+    private function install_required() {
+
+        /** @var Wordlift_Install $install */
+        foreach ( $this->installs as $install ) {
+            // Get the install version.
+            $version = $install->get_version();
+
+            if ( version_compare( $version, $this->get_current_version(), '>' )
+                 || $install->must_install() ) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Retrieve the current db version.
+     *
+     * @return type
+     */
+    private function get_current_version() {
+        return get_option( 'wl_db_version', '0.0.0' );
+    }
 
 }

Spacing +38 added lines, -38 removed lines

@@ -49,28 +49,28 @@ 
 	public function __construct() {
 
 		/** Installs. */
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-1-0-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-10-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-12-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-14-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-15-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-18-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-18-3.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-19-5.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-20-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-23-4.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-24-2.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-all-entity-types.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-package-type.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-25-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-27-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-27-1.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-28-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-32-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-33-9.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-36-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-38-5.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-1-0-0.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-10-0.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-12-0.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-14-0.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-15-0.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-18-0.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-18-3.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-19-5.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-20-0.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-23-4.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-24-2.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-all-entity-types.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-package-type.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-25-0.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-27-0.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-27-1.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-28-0.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-32-0.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-33-9.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-36-0.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-38-5.php';
 		// Get the install services.
 		$this->installs = array(
 			new Wordlift_Install_1_0_0(),
@@ -104,9 +104,9 @@ 
 		);
 		self::$instance = $this;
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
-		add_action( 'init', array( $this, 'install' ) );
+		add_action('init', array($this, 'install'));
 
 	}
 
@@ -132,30 +132,30 @@ 
 
 		$version = null;
 
-		if ( $this->install_required() && false === get_transient( '_wl_installing' ) ) {
-			set_transient( '_wl_installing', true, 5 * MINUTE_IN_SECONDS );
+		if ($this->install_required() && false === get_transient('_wl_installing')) {
+			set_transient('_wl_installing', true, 5 * MINUTE_IN_SECONDS);
 			/** @var Wordlift_Install $install */
-			foreach ( $this->installs as $install ) {
+			foreach ($this->installs as $install) {
 				// Get the install version.
 				$version = $install->get_version();
 
-				if ( version_compare( $version, $this->get_current_version(), '>' )
-					 || $install->must_install() ) {
-					$class_name = get_class( $install );
+				if (version_compare($version, $this->get_current_version(), '>')
+					 || $install->must_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);
 				}
 			}
 
 			// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
-			@delete_transient( '_wl_installing' );
+			@delete_transient('_wl_installing');
 
 		}
 
@@ -164,12 +164,12 @@ 
 	private function install_required() {
 
 		/** @var Wordlift_Install $install */
-		foreach ( $this->installs as $install ) {
+		foreach ($this->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()) {
 				return true;
 			}
 		}
@@ -183,7 +183,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/install/class-wordlift-install-3-38-5.php

Indentation +15 added lines, -15 removed lines

@@ -7,27 +7,27 @@
  */
 class Wordlift_Install_3_38_5 extends Wordlift_Install {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	protected static $version = '3.38.5';
+    /**
+     * {@inheritdoc}
+     */
+    protected static $version = '3.38.5';
 
-	public function install() {
-		global $wpdb;
+    public function install() {
+        global $wpdb;
 
-		$wpdb->query(
-			$wpdb->prepare(
-				"DELETE FROM $wpdb->postmeta
+        $wpdb->query(
+            $wpdb->prepare(
+                "DELETE FROM $wpdb->postmeta
 				WHERE meta_key = %s
 					AND meta_value NOT LIKE '%\"@id\":%'
 				",
-				'_wl_main_ingredient_jsonld'
-			)
-		);
+                '_wl_main_ingredient_jsonld'
+            )
+        );
 
-		// Flush the JSON-LD caches.
-		do_action( 'wl_ttl_cache_cleaner__flush' );
+        // Flush the JSON-LD caches.
+        do_action( 'wl_ttl_cache_cleaner__flush' );
 
-	}
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 		);
 
 		// Flush the JSON-LD caches.
-		do_action( 'wl_ttl_cache_cleaner__flush' );
+		do_action('wl_ttl_cache_cleaner__flush');
 
 	}
 

src/wordlift.php

Indentation +142 added lines, -142 removed lines

@@ -33,7 +33,7 @@ 
 
 // If this file is called directly, abort.
 if ( ! defined( 'WPINC' ) ) {
-	die;
+    die;
 }
 
 define( 'WORDLIFT_VERSION', '3.38.5' );
@@ -44,7 +44,7 @@ 
  * @since 3.33.6
  */
 if ( ! apply_filters( 'wl_is_enabled', true ) ) {
-	return;
+    return;
 }
 
 require_once plugin_dir_path( __FILE__ ) . 'vendor/autoload.php';
@@ -73,29 +73,29 @@ 
  */
 function activate_wordlift() {
 
-	$log = Wordlift_Log_Service::get_logger( 'activate_wordlift' );
-
-	$log->info( 'Activating WordLift...' );
-
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
-	Wordlift_Activator::activate();
-
-	/**
-	 * Tell the {@link Wordlift_Http_Api} class that we're activating, to let it run activation tasks.
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/820 related issue.
-	 * @since 3.19.2
-	 */
-	Wordlift_Http_Api::activate();
-
-	// Ensure the post type is registered before flushing the rewrite rules.
-	Wordlift_Entity_Post_Type_Service::get_instance()->register();
-	flush_rewrite_rules();
-	/**
-	 * @since 3.27.7
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/1214
-	 */
-	Top_Entities::activate();
+    $log = Wordlift_Log_Service::get_logger( 'activate_wordlift' );
+
+    $log->info( 'Activating WordLift...' );
+
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
+    Wordlift_Activator::activate();
+
+    /**
+     * Tell the {@link Wordlift_Http_Api} class that we're activating, to let it run activation tasks.
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/820 related issue.
+     * @since 3.19.2
+     */
+    Wordlift_Http_Api::activate();
+
+    // Ensure the post type is registered before flushing the rewrite rules.
+    Wordlift_Entity_Post_Type_Service::get_instance()->register();
+    flush_rewrite_rules();
+    /**
+     * @since 3.27.7
+     * @see https://github.com/insideout10/wordlift-plugin/issues/1214
+     */
+    Top_Entities::activate();
 }
 
 /**
@@ -104,21 +104,21 @@ 
  */
 function deactivate_wordlift() {
 
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
-	Wordlift_Deactivator::deactivate();
-	Wordlift_Http_Api::deactivate();
-	Ttl_Cache_Cleaner::deactivate();
-	/**
-	 * @since 3.27.7
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/1214
-	 */
-	Top_Entities::deactivate();
-	/**
-	 * @since 3.27.8
-	 * Remove notification flag on deactivation.
-	 */
-	Key_Validation_Notice::remove_notification_flag();
-	flush_rewrite_rules();
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
+    Wordlift_Deactivator::deactivate();
+    Wordlift_Http_Api::deactivate();
+    Ttl_Cache_Cleaner::deactivate();
+    /**
+     * @since 3.27.7
+     * @see https://github.com/insideout10/wordlift-plugin/issues/1214
+     */
+    Top_Entities::deactivate();
+    /**
+     * @since 3.27.8
+     * Remove notification flag on deactivation.
+     */
+    Key_Validation_Notice::remove_notification_flag();
+    flush_rewrite_rules();
 
 }
 
@@ -141,84 +141,84 @@ 
  * @since    1.0.0
  */
 function run_wordlift() {
-	/**
-	 * Filter: wl_feature__enable__widgets.
-	 *
-	 * @param bool whether the widgets needed to be registered, defaults to true.
-	 *
-	 * @return bool
-	 * @since 3.27.6
-	 */
-	if ( apply_filters( 'wl_feature__enable__widgets', true ) ) {
-		add_action( 'widgets_init', 'wl_register_chord_widget' );
-		add_action( 'widgets_init', 'wl_register_geo_widget' );
-		add_action( 'widgets_init', 'wl_register_timeline_widget' );
-	}
-	add_filter( 'widget_text', 'do_shortcode' );
-
-	/**
-	 * Filter: wl_feature__enable__analysis
-	 *
-	 * @param bool Whether to send api request to analysis or not
-	 *
-	 * @return bool
-	 * @since 3.27.6
-	 */
-	if ( apply_filters( 'wl_feature__enable__analysis', true ) ) {
-		add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_action' );
-	} else {
-		add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_disabled_action' );
-	}
-
-	$plugin = new Wordlift();
-	$plugin->run();
-
-	// Initialize the TTL Cache Cleaner.
-	new Ttl_Cache_Cleaner();
-
-	// Load the new Post Adapter.
-	new Post_Adapter();
-
-	// Load the API Data Hooks.
-	new Api_Data_Hooks();
-
-	add_action(
-		'plugins_loaded',
-		function () {
-			// All features from registry should be initialized here.
-			$features_registry = Features_Registry::get_instance();
-			$features_registry->initialize_all_features();
-		},
-		5
-	);
-
-	add_action(
-		'plugins_loaded',
-		// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		function () use ( $plugin ) {
-
-			new Wordlift_Products_Navigator_Shortcode_REST();
-
-			// Register the Dataset module, requires `$api_service`.
-			require_once plugin_dir_path( __FILE__ ) . 'wordlift/dataset/index.php';
-			require_once plugin_dir_path( __FILE__ ) . 'wordlift/shipping-data/index.php';
-
-			/*
+    /**
+     * Filter: wl_feature__enable__widgets.
+     *
+     * @param bool whether the widgets needed to be registered, defaults to true.
+     *
+     * @return bool
+     * @since 3.27.6
+     */
+    if ( apply_filters( 'wl_feature__enable__widgets', true ) ) {
+        add_action( 'widgets_init', 'wl_register_chord_widget' );
+        add_action( 'widgets_init', 'wl_register_geo_widget' );
+        add_action( 'widgets_init', 'wl_register_timeline_widget' );
+    }
+    add_filter( 'widget_text', 'do_shortcode' );
+
+    /**
+     * Filter: wl_feature__enable__analysis
+     *
+     * @param bool Whether to send api request to analysis or not
+     *
+     * @return bool
+     * @since 3.27.6
+     */
+    if ( apply_filters( 'wl_feature__enable__analysis', true ) ) {
+        add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_action' );
+    } else {
+        add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_disabled_action' );
+    }
+
+    $plugin = new Wordlift();
+    $plugin->run();
+
+    // Initialize the TTL Cache Cleaner.
+    new Ttl_Cache_Cleaner();
+
+    // Load the new Post Adapter.
+    new Post_Adapter();
+
+    // Load the API Data Hooks.
+    new Api_Data_Hooks();
+
+    add_action(
+        'plugins_loaded',
+        function () {
+            // All features from registry should be initialized here.
+            $features_registry = Features_Registry::get_instance();
+            $features_registry->initialize_all_features();
+        },
+        5
+    );
+
+    add_action(
+        'plugins_loaded',
+        // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+        function () use ( $plugin ) {
+
+            new Wordlift_Products_Navigator_Shortcode_REST();
+
+            // Register the Dataset module, requires `$api_service`.
+            require_once plugin_dir_path( __FILE__ ) . 'wordlift/dataset/index.php';
+            require_once plugin_dir_path( __FILE__ ) . 'wordlift/shipping-data/index.php';
+
+            /*
 			* Require the Entity annotation cleanup module.
 			*
 			* @since 3.34.6
 			*/
-			require_once plugin_dir_path( __FILE__ ) . 'wordlift/cleanup/index.php';
+            require_once plugin_dir_path( __FILE__ ) . 'wordlift/cleanup/index.php';
 
-			/*
+            /*
 			* Import LOD entities.
 			*
 			* @since 3.35.0
 			*/
-			require_once plugin_dir_path( __FILE__ ) . 'wordlift/lod-import/index.php';
+            require_once plugin_dir_path( __FILE__ ) . 'wordlift/lod-import/index.php';
 
-		}
-	);
+        }
+    );
 
 }
 
@@ -232,45 +232,45 @@ 
  */
 function wordlift_plugin_autoload_register() {
 
-	spl_autoload_register(
-		function ( $class_name ) {
+    spl_autoload_register(
+        function ( $class_name ) {
 
-			// Bail out if these are not our classes.
-			if ( 0 !== strpos( $class_name, 'Wordlift\\' ) ) {
-				return false;
-			}
+            // Bail out if these are not our classes.
+            if ( 0 !== strpos( $class_name, 'Wordlift\\' ) ) {
+                return false;
+            }
 
-			$class_name_lc = strtolower( str_replace( '_', '-', $class_name ) );
+            $class_name_lc = strtolower( str_replace( '_', '-', $class_name ) );
 
-			preg_match( '|^(?:(.*)\\\\)?(.+?)$|', $class_name_lc, $matches );
+            preg_match( '|^(?:(.*)\\\\)?(.+?)$|', $class_name_lc, $matches );
 
-			$path = str_replace( '\\', DIRECTORY_SEPARATOR, $matches[1] );
-			$file = 'class-' . $matches[2] . '.php';
+            $path = str_replace( '\\', DIRECTORY_SEPARATOR, $matches[1] );
+            $file = 'class-' . $matches[2] . '.php';
 
-			$full_path = plugin_dir_path( __FILE__ ) . $path . DIRECTORY_SEPARATOR . $file;
+            $full_path = plugin_dir_path( __FILE__ ) . $path . DIRECTORY_SEPARATOR . $file;
 
-			if ( ! file_exists( $full_path ) ) {
-				return false;
-			}
+            if ( ! file_exists( $full_path ) ) {
+                return false;
+            }
 
-			require_once $full_path;
+            require_once $full_path;
 
-			return true;
-		}
-	);
+            return true;
+        }
+    );
 
 }
 
 function wl_block_categories( $categories ) {
-	return array_merge(
-		$categories,
-		array(
-			array(
-				'slug'  => 'wordlift',
-				'title' => __( 'WordLift', 'wordlift' ),
-			),
-		)
-	);
+    return array_merge(
+        $categories,
+        array(
+            array(
+                'slug'  => 'wordlift',
+                'title' => __( 'WordLift', 'wordlift' ),
+            ),
+        )
+    );
 }
 
 /**
@@ -278,19 +278,19 @@ 
  * this has to be removed when removing the legacy fields from the ui.
  */
 function wl_enqueue_leaflet( $in_footer = false ) {
-	// Leaflet.
-	wp_enqueue_style( 'wl-leaflet', plugin_dir_url( __FILE__ ) . 'js/leaflet/leaflet.css', array(), '1.6.0' );
-	wp_enqueue_script( 'wl-leaflet', plugin_dir_url( __FILE__ ) . 'js/leaflet/leaflet.js', array(), '1.6.0', $in_footer );
+    // Leaflet.
+    wp_enqueue_style( 'wl-leaflet', plugin_dir_url( __FILE__ ) . 'js/leaflet/leaflet.css', array(), '1.6.0' );
+    wp_enqueue_script( 'wl-leaflet', plugin_dir_url( __FILE__ ) . 'js/leaflet/leaflet.js', array(), '1.6.0', $in_footer );
 }
 
 add_filter( 'block_categories', 'wl_block_categories', 10 );
 
 // Temporary fix for a typo in WooCommerce Extension.
 add_filter(
-	'wl_feature__enable__dataset',
-	function ( $value ) {
-		return apply_filters( 'wl_features__enable__dataset', $value );
-	}
+    'wl_feature__enable__dataset',
+    function ( $value ) {
+        return apply_filters( 'wl_features__enable__dataset', $value );
+    }
 );
 
 require_once __DIR__ . '/modules/food-kg/load.php';

Spacing +48 added lines, -48 removed lines

@@ -32,22 +32,22 @@ 
 use Wordlift\Post\Post_Adapter;
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if ( ! defined('WPINC')) {
 	die;
 }
 
-define( 'WORDLIFT_VERSION', '3.38.5' );
+define('WORDLIFT_VERSION', '3.38.5');
 
 /**
  * Filter to disable WLP on any request, defaults to true.
  *
  * @since 3.33.6
  */
-if ( ! apply_filters( 'wl_is_enabled', true ) ) {
+if ( ! apply_filters('wl_is_enabled', true)) {
 	return;
 }
 
-require_once plugin_dir_path( __FILE__ ) . 'vendor/autoload.php';
+require_once plugin_dir_path(__FILE__).'vendor/autoload.php';
 
 /*
 	 * We introduce the WordLift autoloader, since we start using classes in namespaces, i.e. Wordlift\Http.
@@ -57,15 +57,15 @@ 
 wordlift_plugin_autoload_register();
 
 // Include WordLift constants.
-require_once plugin_dir_path( __FILE__ ) . 'wordlift-constants.php';
+require_once plugin_dir_path(__FILE__).'wordlift-constants.php';
 
 // Load modules.
-require_once plugin_dir_path( __FILE__ ) . 'modules/core/wordlift-core.php';
+require_once plugin_dir_path(__FILE__).'modules/core/wordlift-core.php';
 
-require_once plugin_dir_path( __FILE__ ) . 'deprecations.php';
+require_once plugin_dir_path(__FILE__).'deprecations.php';
 
 // Load early to enable/disable features.
-require_once plugin_dir_path( __FILE__ ) . 'wordlift/features/index.php';
+require_once plugin_dir_path(__FILE__).'wordlift/features/index.php';
 
 /**
  * The code that runs during plugin activation.
@@ -73,11 +73,11 @@ 
  */
 function activate_wordlift() {
 
-	$log = Wordlift_Log_Service::get_logger( 'activate_wordlift' );
+	$log = Wordlift_Log_Service::get_logger('activate_wordlift');
 
-	$log->info( 'Activating WordLift...' );
+	$log->info('Activating WordLift...');
 
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-wordlift-activator.php';
 	Wordlift_Activator::activate();
 
 	/**
@@ -104,7 +104,7 @@ 
  */
 function deactivate_wordlift() {
 
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-wordlift-deactivator.php';
 	Wordlift_Deactivator::deactivate();
 	Wordlift_Http_Api::deactivate();
 	Ttl_Cache_Cleaner::deactivate();
@@ -122,14 +122,14 @@ 
 
 }
 
-register_activation_hook( __FILE__, 'activate_wordlift' );
-register_deactivation_hook( __FILE__, 'deactivate_wordlift' );
+register_activation_hook(__FILE__, 'activate_wordlift');
+register_deactivation_hook(__FILE__, 'deactivate_wordlift');
 
 /**
  * The core plugin class that is used to define internationalization,
  * admin-specific hooks, and public-facing site hooks.
  */
-require plugin_dir_path( __FILE__ ) . 'includes/class-wordlift.php';
+require plugin_dir_path(__FILE__).'includes/class-wordlift.php';
 
 /**
  * Begins execution of the plugin.
@@ -149,12 +149,12 @@ 
 	 * @return bool
 	 * @since 3.27.6
 	 */
-	if ( apply_filters( 'wl_feature__enable__widgets', true ) ) {
-		add_action( 'widgets_init', 'wl_register_chord_widget' );
-		add_action( 'widgets_init', 'wl_register_geo_widget' );
-		add_action( 'widgets_init', 'wl_register_timeline_widget' );
+	if (apply_filters('wl_feature__enable__widgets', true)) {
+		add_action('widgets_init', 'wl_register_chord_widget');
+		add_action('widgets_init', 'wl_register_geo_widget');
+		add_action('widgets_init', 'wl_register_timeline_widget');
 	}
-	add_filter( 'widget_text', 'do_shortcode' );
+	add_filter('widget_text', 'do_shortcode');
 
 	/**
 	 * Filter: wl_feature__enable__analysis
@@ -164,10 +164,10 @@ 
 	 * @return bool
 	 * @since 3.27.6
 	 */
-	if ( apply_filters( 'wl_feature__enable__analysis', true ) ) {
-		add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_action' );
+	if (apply_filters('wl_feature__enable__analysis', true)) {
+		add_action('wp_ajax_wl_analyze', 'wl_ajax_analyze_action');
 	} else {
-		add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_disabled_action' );
+		add_action('wp_ajax_wl_analyze', 'wl_ajax_analyze_disabled_action');
 	}
 
 	$plugin = new Wordlift();
@@ -184,7 +184,7 @@ 
 
 	add_action(
 		'plugins_loaded',
-		function () {
+		function() {
 			// All features from registry should be initialized here.
 			$features_registry = Features_Registry::get_instance();
 			$features_registry->initialize_all_features();
@@ -195,27 +195,27 @@ 
 	add_action(
 		'plugins_loaded',
 		// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		function () use ( $plugin ) {
+		function() use ($plugin) {
 
 			new Wordlift_Products_Navigator_Shortcode_REST();
 
 			// Register the Dataset module, requires `$api_service`.
-			require_once plugin_dir_path( __FILE__ ) . 'wordlift/dataset/index.php';
-			require_once plugin_dir_path( __FILE__ ) . 'wordlift/shipping-data/index.php';
+			require_once plugin_dir_path(__FILE__).'wordlift/dataset/index.php';
+			require_once plugin_dir_path(__FILE__).'wordlift/shipping-data/index.php';
 
 			/*
 			* Require the Entity annotation cleanup module.
 			*
 			* @since 3.34.6
 			*/
-			require_once plugin_dir_path( __FILE__ ) . 'wordlift/cleanup/index.php';
+			require_once plugin_dir_path(__FILE__).'wordlift/cleanup/index.php';
 
 			/*
 			* Import LOD entities.
 			*
 			* @since 3.35.0
 			*/
-			require_once plugin_dir_path( __FILE__ ) . 'wordlift/lod-import/index.php';
+			require_once plugin_dir_path(__FILE__).'wordlift/lod-import/index.php';
 
 		}
 	);
@@ -233,23 +233,23 @@ 
 function wordlift_plugin_autoload_register() {
 
 	spl_autoload_register(
-		function ( $class_name ) {
+		function($class_name) {
 
 			// Bail out if these are not our classes.
-			if ( 0 !== strpos( $class_name, 'Wordlift\\' ) ) {
+			if (0 !== strpos($class_name, 'Wordlift\\')) {
 				return false;
 			}
 
-			$class_name_lc = strtolower( str_replace( '_', '-', $class_name ) );
+			$class_name_lc = strtolower(str_replace('_', '-', $class_name));
 
-			preg_match( '|^(?:(.*)\\\\)?(.+?)$|', $class_name_lc, $matches );
+			preg_match('|^(?:(.*)\\\\)?(.+?)$|', $class_name_lc, $matches);
 
-			$path = str_replace( '\\', DIRECTORY_SEPARATOR, $matches[1] );
-			$file = 'class-' . $matches[2] . '.php';
+			$path = str_replace('\\', DIRECTORY_SEPARATOR, $matches[1]);
+			$file = 'class-'.$matches[2].'.php';
 
-			$full_path = plugin_dir_path( __FILE__ ) . $path . DIRECTORY_SEPARATOR . $file;
+			$full_path = plugin_dir_path(__FILE__).$path.DIRECTORY_SEPARATOR.$file;
 
-			if ( ! file_exists( $full_path ) ) {
+			if ( ! file_exists($full_path)) {
 				return false;
 			}
 
@@ -261,13 +261,13 @@ 
 
 }
 
-function wl_block_categories( $categories ) {
+function wl_block_categories($categories) {
 	return array_merge(
 		$categories,
 		array(
 			array(
 				'slug'  => 'wordlift',
-				'title' => __( 'WordLift', 'wordlift' ),
+				'title' => __('WordLift', 'wordlift'),
 			),
 		)
 	);
@@ -277,22 +277,22 @@ 
  * This function is created temporarily to handle the legacy library,
  * this has to be removed when removing the legacy fields from the ui.
  */
-function wl_enqueue_leaflet( $in_footer = false ) {
+function wl_enqueue_leaflet($in_footer = false) {
 	// Leaflet.
-	wp_enqueue_style( 'wl-leaflet', plugin_dir_url( __FILE__ ) . 'js/leaflet/leaflet.css', array(), '1.6.0' );
-	wp_enqueue_script( 'wl-leaflet', plugin_dir_url( __FILE__ ) . 'js/leaflet/leaflet.js', array(), '1.6.0', $in_footer );
+	wp_enqueue_style('wl-leaflet', plugin_dir_url(__FILE__).'js/leaflet/leaflet.css', array(), '1.6.0');
+	wp_enqueue_script('wl-leaflet', plugin_dir_url(__FILE__).'js/leaflet/leaflet.js', array(), '1.6.0', $in_footer);
 }
 
-add_filter( 'block_categories', 'wl_block_categories', 10 );
+add_filter('block_categories', 'wl_block_categories', 10);
 
 // Temporary fix for a typo in WooCommerce Extension.
 add_filter(
 	'wl_feature__enable__dataset',
-	function ( $value ) {
-		return apply_filters( 'wl_features__enable__dataset', $value );
+	function($value) {
+		return apply_filters('wl_features__enable__dataset', $value);
 	}
 );
 
-require_once __DIR__ . '/modules/food-kg/load.php';
-require_once __DIR__ . '/modules/acf4so/load.php';
-require_once __DIR__ . '/modules/pods/load.php';
+require_once __DIR__.'/modules/food-kg/load.php';
+require_once __DIR__.'/modules/acf4so/load.php';
+require_once __DIR__.'/modules/pods/load.php';

src/modules/food-kg/load.php

Indentation +67 added lines, -67 removed lines

@@ -20,79 +20,79 @@
 use Wordlift\Task\Background\Background_Task_Route;
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 define( 'WL_FOOD_KG_FILE', __FILE__ );
 define( 'WL_FOOD_KG_DIR_PATH', dirname( WL_FOOD_KG_FILE ) );
 
 function __wl_foodkg__load() {
-	// Autoloader for dependencies.
-	if ( file_exists( WL_FOOD_KG_DIR_PATH . '/third-party/vendor/scoper-autoload.php' ) ) {
-		require WL_FOOD_KG_DIR_PATH . '/third-party/vendor/scoper-autoload.php';
-	}
-
-	// Autoloader for plugin itself.
-	if ( file_exists( WL_FOOD_KG_DIR_PATH . '/includes/vendor/autoload.php' ) ) {
-		require WL_FOOD_KG_DIR_PATH . '/includes/vendor/autoload.php';
-	}
-
-	$container_builder = new ContainerBuilder();
-	$loader            = new YamlFileLoader( $container_builder, new FileLocator( __DIR__ ) );
-	$loader->load( 'services.yml' );
-	$container_builder->compile();
-
-	$notices = $container_builder->get( 'Wordlift\Modules\Food_Kg\Notices' );
-	$notices->register_hooks();
-
-	/**
-	 * @var Preconditions $preconditions
-	 */
-	$preconditions = $container_builder->get( 'Wordlift\Modules\Food_Kg\Preconditions' );
-	if ( ! $preconditions->pass() ) {
-		return;
-	}
-
-	// Meta Box.
-	$meta_box = $container_builder->get( 'Wordlift\Modules\Food_Kg\Admin\Meta_Box' );
-	$meta_box->register_hooks();
-
-	$module = $container_builder->get( 'Wordlift\Modules\Food_Kg\Module' );
-	$module->register_hooks();
-
-	/** @var Jsonld $jsonld */
-	$jsonld = $container_builder->get( 'Wordlift\Modules\Food_Kg\Jsonld' );
-	$jsonld->register_hooks();
-
-	/** @var Main_Ingredient_Jsonld $jsonld */
-	$main_ingredient_jsonld = $container_builder->get( 'Wordlift\Modules\Food_Kg\Main_Ingredient_Jsonld' );
-	$main_ingredient_jsonld->register_hooks();
-
-
-	/** Prepare the background task. */
-	$main_ingredient_recipe_lift = $container_builder->get( 'Wordlift\Modules\Food_Kg\Main_Ingredient_Recipe_Lift_Strategy' );
-	$task                        = new All_Posts_Task(
-		array(
-			$main_ingredient_recipe_lift,
-			'process'
-		),
-		'wprm_recipe',
-		'sync-main-ingredient'
-	);
-	$background_task             = Background_Task::create( $task );
-	$background_task_route       = Background_Task_Route::create( $background_task, '/main-ingredient' );
-	Background_Task_Page::create( __( 'Synchronize Main Ingredient', 'wordlift' ), 'sync-main-ingredient', $background_task_route );
-
-
-	if ( is_admin() ) {
-		$page = $container_builder->get( 'Wordlift\Modules\Food_Kg\Admin\Page' );
-		$page->register_hooks();
-
-		// Download Ingredients Data.
-		$download_ingredients_data = $container_builder->get( 'Wordlift\Modules\Food_Kg\Admin\Download_Ingredients_Data' );
-		$download_ingredients_data->register_hooks();
-
-	}
+    // Autoloader for dependencies.
+    if ( file_exists( WL_FOOD_KG_DIR_PATH . '/third-party/vendor/scoper-autoload.php' ) ) {
+        require WL_FOOD_KG_DIR_PATH . '/third-party/vendor/scoper-autoload.php';
+    }
+
+    // Autoloader for plugin itself.
+    if ( file_exists( WL_FOOD_KG_DIR_PATH . '/includes/vendor/autoload.php' ) ) {
+        require WL_FOOD_KG_DIR_PATH . '/includes/vendor/autoload.php';
+    }
+
+    $container_builder = new ContainerBuilder();
+    $loader            = new YamlFileLoader( $container_builder, new FileLocator( __DIR__ ) );
+    $loader->load( 'services.yml' );
+    $container_builder->compile();
+
+    $notices = $container_builder->get( 'Wordlift\Modules\Food_Kg\Notices' );
+    $notices->register_hooks();
+
+    /**
+     * @var Preconditions $preconditions
+     */
+    $preconditions = $container_builder->get( 'Wordlift\Modules\Food_Kg\Preconditions' );
+    if ( ! $preconditions->pass() ) {
+        return;
+    }
+
+    // Meta Box.
+    $meta_box = $container_builder->get( 'Wordlift\Modules\Food_Kg\Admin\Meta_Box' );
+    $meta_box->register_hooks();
+
+    $module = $container_builder->get( 'Wordlift\Modules\Food_Kg\Module' );
+    $module->register_hooks();
+
+    /** @var Jsonld $jsonld */
+    $jsonld = $container_builder->get( 'Wordlift\Modules\Food_Kg\Jsonld' );
+    $jsonld->register_hooks();
+
+    /** @var Main_Ingredient_Jsonld $jsonld */
+    $main_ingredient_jsonld = $container_builder->get( 'Wordlift\Modules\Food_Kg\Main_Ingredient_Jsonld' );
+    $main_ingredient_jsonld->register_hooks();
+
+
+    /** Prepare the background task. */
+    $main_ingredient_recipe_lift = $container_builder->get( 'Wordlift\Modules\Food_Kg\Main_Ingredient_Recipe_Lift_Strategy' );
+    $task                        = new All_Posts_Task(
+        array(
+            $main_ingredient_recipe_lift,
+            'process'
+        ),
+        'wprm_recipe',
+        'sync-main-ingredient'
+    );
+    $background_task             = Background_Task::create( $task );
+    $background_task_route       = Background_Task_Route::create( $background_task, '/main-ingredient' );
+    Background_Task_Page::create( __( 'Synchronize Main Ingredient', 'wordlift' ), 'sync-main-ingredient', $background_task_route );
+
+
+    if ( is_admin() ) {
+        $page = $container_builder->get( 'Wordlift\Modules\Food_Kg\Admin\Page' );
+        $page->register_hooks();
+
+        // Download Ingredients Data.
+        $download_ingredients_data = $container_builder->get( 'Wordlift\Modules\Food_Kg\Admin\Download_Ingredients_Data' );
+        $download_ingredients_data->register_hooks();
+
+    }
 }
 
 add_action( 'plugins_loaded', '__wl_foodkg__load' );

Spacing +24 added lines, -24 removed lines

@@ -19,58 +19,58 @@ 
 use Wordlift\Task\Background\Background_Task_Page;
 use Wordlift\Task\Background\Background_Task_Route;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-define( 'WL_FOOD_KG_FILE', __FILE__ );
-define( 'WL_FOOD_KG_DIR_PATH', dirname( WL_FOOD_KG_FILE ) );
+define('WL_FOOD_KG_FILE', __FILE__);
+define('WL_FOOD_KG_DIR_PATH', dirname(WL_FOOD_KG_FILE));
 
 function __wl_foodkg__load() {
 	// Autoloader for dependencies.
-	if ( file_exists( WL_FOOD_KG_DIR_PATH . '/third-party/vendor/scoper-autoload.php' ) ) {
-		require WL_FOOD_KG_DIR_PATH . '/third-party/vendor/scoper-autoload.php';
+	if (file_exists(WL_FOOD_KG_DIR_PATH.'/third-party/vendor/scoper-autoload.php')) {
+		require WL_FOOD_KG_DIR_PATH.'/third-party/vendor/scoper-autoload.php';
 	}
 
 	// Autoloader for plugin itself.
-	if ( file_exists( WL_FOOD_KG_DIR_PATH . '/includes/vendor/autoload.php' ) ) {
-		require WL_FOOD_KG_DIR_PATH . '/includes/vendor/autoload.php';
+	if (file_exists(WL_FOOD_KG_DIR_PATH.'/includes/vendor/autoload.php')) {
+		require WL_FOOD_KG_DIR_PATH.'/includes/vendor/autoload.php';
 	}
 
 	$container_builder = new ContainerBuilder();
-	$loader            = new YamlFileLoader( $container_builder, new FileLocator( __DIR__ ) );
-	$loader->load( 'services.yml' );
+	$loader            = new YamlFileLoader($container_builder, new FileLocator(__DIR__));
+	$loader->load('services.yml');
 	$container_builder->compile();
 
-	$notices = $container_builder->get( 'Wordlift\Modules\Food_Kg\Notices' );
+	$notices = $container_builder->get('Wordlift\Modules\Food_Kg\Notices');
 	$notices->register_hooks();
 
 	/**
 	 * @var Preconditions $preconditions
 	 */
-	$preconditions = $container_builder->get( 'Wordlift\Modules\Food_Kg\Preconditions' );
-	if ( ! $preconditions->pass() ) {
+	$preconditions = $container_builder->get('Wordlift\Modules\Food_Kg\Preconditions');
+	if ( ! $preconditions->pass()) {
 		return;
 	}
 
 	// Meta Box.
-	$meta_box = $container_builder->get( 'Wordlift\Modules\Food_Kg\Admin\Meta_Box' );
+	$meta_box = $container_builder->get('Wordlift\Modules\Food_Kg\Admin\Meta_Box');
 	$meta_box->register_hooks();
 
-	$module = $container_builder->get( 'Wordlift\Modules\Food_Kg\Module' );
+	$module = $container_builder->get('Wordlift\Modules\Food_Kg\Module');
 	$module->register_hooks();
 
 	/** @var Jsonld $jsonld */
-	$jsonld = $container_builder->get( 'Wordlift\Modules\Food_Kg\Jsonld' );
+	$jsonld = $container_builder->get('Wordlift\Modules\Food_Kg\Jsonld');
 	$jsonld->register_hooks();
 
 	/** @var Main_Ingredient_Jsonld $jsonld */
-	$main_ingredient_jsonld = $container_builder->get( 'Wordlift\Modules\Food_Kg\Main_Ingredient_Jsonld' );
+	$main_ingredient_jsonld = $container_builder->get('Wordlift\Modules\Food_Kg\Main_Ingredient_Jsonld');
 	$main_ingredient_jsonld->register_hooks();
 
 
 	/** Prepare the background task. */
-	$main_ingredient_recipe_lift = $container_builder->get( 'Wordlift\Modules\Food_Kg\Main_Ingredient_Recipe_Lift_Strategy' );
+	$main_ingredient_recipe_lift = $container_builder->get('Wordlift\Modules\Food_Kg\Main_Ingredient_Recipe_Lift_Strategy');
 	$task                        = new All_Posts_Task(
 		array(
 			$main_ingredient_recipe_lift,
@@ -79,21 +79,21 @@ 
 		'wprm_recipe',
 		'sync-main-ingredient'
 	);
-	$background_task             = Background_Task::create( $task );
-	$background_task_route       = Background_Task_Route::create( $background_task, '/main-ingredient' );
-	Background_Task_Page::create( __( 'Synchronize Main Ingredient', 'wordlift' ), 'sync-main-ingredient', $background_task_route );
+	$background_task             = Background_Task::create($task);
+	$background_task_route       = Background_Task_Route::create($background_task, '/main-ingredient');
+	Background_Task_Page::create(__('Synchronize Main Ingredient', 'wordlift'), 'sync-main-ingredient', $background_task_route);
 
 
-	if ( is_admin() ) {
-		$page = $container_builder->get( 'Wordlift\Modules\Food_Kg\Admin\Page' );
+	if (is_admin()) {
+		$page = $container_builder->get('Wordlift\Modules\Food_Kg\Admin\Page');
 		$page->register_hooks();
 
 		// Download Ingredients Data.
-		$download_ingredients_data = $container_builder->get( 'Wordlift\Modules\Food_Kg\Admin\Download_Ingredients_Data' );
+		$download_ingredients_data = $container_builder->get('Wordlift\Modules\Food_Kg\Admin\Download_Ingredients_Data');
 		$download_ingredients_data->register_hooks();
 
 	}
 }
 
-add_action( 'plugins_loaded', '__wl_foodkg__load' );
+add_action('plugins_loaded', '__wl_foodkg__load');
 

src/modules/food-kg/includes/admin/Main_Ingredient_List_Table.php

Indentation +103 added lines, -103 removed lines

@@ -3,43 +3,43 @@ 
 namespace Wordlift\Modules\Food_Kg\Admin;
 
 if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+    require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
 use WP_List_Table;
 
 class Main_Ingredient_List_Table extends WP_List_Table {
 
-	public function prepare_items() {
-		global $wpdb; // This is used only if making any database queries
-
-		/**
-		 * REQUIRED. Now we need to define our column headers. This includes a complete
-		 * array of columns to be displayed (slugs & titles), a list of columns
-		 * to keep hidden, and a list of columns that are sortable. Each of these
-		 * can be defined in another method (as we've done here) before being
-		 * used to build the value for our _column_headers property.
-		 */
-		$columns  = $this->get_columns();
-		$hidden   = array();
-		$sortable = $this->get_sortable_columns();
-
-		/**
-		 * REQUIRED. Finally, we build an array to be used by the class for column
-		 * headers. The $this->_column_headers property takes an array which contains
-		 * 3 other arrays. One for all columns, one for hidden columns, and one
-		 * for sortable columns.
-		 */
-		$this->_column_headers = array( $columns, $hidden, $sortable );
-
-		// Pagination.
-		$per_page     = 20;
-		$current_page = $this->get_pagenum();
-		$total_items  = $this->count();
-
-		$this->items = $wpdb->get_results(
-			$wpdb->prepare(
-				"SELECT p1.ID AS recipe_ID,
+    public function prepare_items() {
+        global $wpdb; // This is used only if making any database queries
+
+        /**
+         * REQUIRED. Now we need to define our column headers. This includes a complete
+         * array of columns to be displayed (slugs & titles), a list of columns
+         * to keep hidden, and a list of columns that are sortable. Each of these
+         * can be defined in another method (as we've done here) before being
+         * used to build the value for our _column_headers property.
+         */
+        $columns  = $this->get_columns();
+        $hidden   = array();
+        $sortable = $this->get_sortable_columns();
+
+        /**
+         * REQUIRED. Finally, we build an array to be used by the class for column
+         * headers. The $this->_column_headers property takes an array which contains
+         * 3 other arrays. One for all columns, one for hidden columns, and one
+         * for sortable columns.
+         */
+        $this->_column_headers = array( $columns, $hidden, $sortable );
+
+        // Pagination.
+        $per_page     = 20;
+        $current_page = $this->get_pagenum();
+        $total_items  = $this->count();
+
+        $this->items = $wpdb->get_results(
+            $wpdb->prepare(
+                "SELECT p1.ID AS recipe_ID,
 					    p1.post_title AS recipe_name,
 					    p2.ID AS post_ID,
 					    p2.post_title,
@@ -53,29 +53,29 @@ 
 					WHERE p1.post_type = 'wprm_recipe'
 					LIMIT %d
 					OFFSET %d",
-				$per_page,
-				( $current_page - 1 ) * $per_page
-			)
-		);
+                $per_page,
+                ( $current_page - 1 ) * $per_page
+            )
+        );
 
-		$this->set_pagination_args(
-			array(
-				'total_items' => $total_items,
-				'per_page'    => $per_page,
-				'total_pages' => ceil( $total_items / $per_page ),
-			)
-		);
-	}
+        $this->set_pagination_args(
+            array(
+                'total_items' => $total_items,
+                'per_page'    => $per_page,
+                'total_pages' => ceil( $total_items / $per_page ),
+            )
+        );
+    }
 
-	private function count() {
-		global $wpdb;
+    private function count() {
+        global $wpdb;
 
-		$count = get_transient( '_wl_main_ingredient_list_table__count' );
+        $count = get_transient( '_wl_main_ingredient_list_table__count' );
 
-		if ( ! $count ) {
+        if ( ! $count ) {
 
-			$count = $wpdb->get_var(
-				"SELECT COUNT( 1 ) 
+            $count = $wpdb->get_var(
+                "SELECT COUNT( 1 ) 
 					FROM {$wpdb->posts} p1
 					    INNER JOIN {$wpdb->postmeta} pm1 ON pm1.post_ID = p1.ID
 					        AND pm1.meta_key = '_wl_main_ingredient_jsonld'
@@ -83,60 +83,60 @@ 
 					        ON p2.post_content LIKE CONCAT( '%<!--WPRM Recipe ', p1.ID,'-->%' )
 					            AND p2.post_status = 'publish'
 					WHERE p1.post_type = 'wprm_recipe'"
-			);
-
-			set_transient( '_wl_main_ingredient_list_table__count', $count, 60 );
-		}
-
-		return $count;
-	}
-
-	public function no_items() {
-		esc_html_e( 'No main ingredients found.', 'wordlift' );
-	}
-
-	public function get_columns() {
-		return array(
-			'ingredient_name' => __( 'Ingredient Name', 'wordlift' ),
-			'recipe_name'     => __( 'Recipe Name', 'wordlift' ),
-			'post_title'      => __( 'Post Title', 'wordlift' ),
-			'url'             => __( 'Post URL', 'wordlift' ),
-			'actions'         => '',
-		);
-	}
-
-	public function column_ingredient_name( $item ) {
-		$recipe_json_ld = get_post_meta( $item->recipe_ID, '_wl_main_ingredient_jsonld', true ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-		$recipe         = json_decode( $recipe_json_ld, true );
-
-		return $recipe ? $recipe['name'] : 'null';
-	}
-
-	public function column_recipe_name( $item ) {
-		return $item->recipe_name;
-	}
-
-	public function column_post_title( $item ) {
-		return sprintf( '<a href="%s">%s</a>', get_edit_post_link( $item->post_ID ), $item->post_title );
-	}
-
-	public function column_url( $item ) {
-		return get_permalink( $item->post_ID );
-	}
-
-	public function column_actions( $item ) {
-
-		$url = admin_url(
-			sprintf( 'admin.php?page=wl_ingredients&modal_window=true&id=%d&TB_iframe=true', $item->recipe_ID )  // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-		);
-
-		return sprintf(
-			'<a href="%s" class="button alignright thickbox open-plugin-details-modal" data-title="%s" type="button">%s</a>',
-			$url,
-			esc_attr( $item->post_title ),
-			esc_html__( 'JSON-LD', 'wordlift' )
-		);
-	}
+            );
+
+            set_transient( '_wl_main_ingredient_list_table__count', $count, 60 );
+        }
+
+        return $count;
+    }
+
+    public function no_items() {
+        esc_html_e( 'No main ingredients found.', 'wordlift' );
+    }
+
+    public function get_columns() {
+        return array(
+            'ingredient_name' => __( 'Ingredient Name', 'wordlift' ),
+            'recipe_name'     => __( 'Recipe Name', 'wordlift' ),
+            'post_title'      => __( 'Post Title', 'wordlift' ),
+            'url'             => __( 'Post URL', 'wordlift' ),
+            'actions'         => '',
+        );
+    }
+
+    public function column_ingredient_name( $item ) {
+        $recipe_json_ld = get_post_meta( $item->recipe_ID, '_wl_main_ingredient_jsonld', true ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+        $recipe         = json_decode( $recipe_json_ld, true );
+
+        return $recipe ? $recipe['name'] : 'null';
+    }
+
+    public function column_recipe_name( $item ) {
+        return $item->recipe_name;
+    }
+
+    public function column_post_title( $item ) {
+        return sprintf( '<a href="%s">%s</a>', get_edit_post_link( $item->post_ID ), $item->post_title );
+    }
+
+    public function column_url( $item ) {
+        return get_permalink( $item->post_ID );
+    }
+
+    public function column_actions( $item ) {
+
+        $url = admin_url(
+            sprintf( 'admin.php?page=wl_ingredients&modal_window=true&id=%d&TB_iframe=true', $item->recipe_ID )  // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+        );
+
+        return sprintf(
+            '<a href="%s" class="button alignright thickbox open-plugin-details-modal" data-title="%s" type="button">%s</a>',
+            $url,
+            esc_attr( $item->post_title ),
+            esc_html__( 'JSON-LD', 'wordlift' )
+        );
+    }
 
 }
 

Spacing +25 added lines, -25 removed lines

@@ -2,8 +2,8 @@ 
 
 namespace Wordlift\Modules\Food_Kg\Admin;
 
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+if ( ! class_exists('WP_List_Table')) {
+	require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
 }
 
 use WP_List_Table;
@@ -30,7 +30,7 @@ 
 		 * 3 other arrays. One for all columns, one for hidden columns, and one
 		 * for sortable columns.
 		 */
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 
 		// Pagination.
 		$per_page     = 20;
@@ -54,7 +54,7 @@ 
 					LIMIT %d
 					OFFSET %d",
 				$per_page,
-				( $current_page - 1 ) * $per_page
+				($current_page - 1) * $per_page
 			)
 		);
 
@@ -62,7 +62,7 @@ 
 			array(
 				'total_items' => $total_items,
 				'per_page'    => $per_page,
-				'total_pages' => ceil( $total_items / $per_page ),
+				'total_pages' => ceil($total_items / $per_page),
 			)
 		);
 	}
@@ -70,9 +70,9 @@ 
 	private function count() {
 		global $wpdb;
 
-		$count = get_transient( '_wl_main_ingredient_list_table__count' );
+		$count = get_transient('_wl_main_ingredient_list_table__count');
 
-		if ( ! $count ) {
+		if ( ! $count) {
 
 			$count = $wpdb->get_var(
 				"SELECT COUNT( 1 ) 
@@ -85,56 +85,56 @@ 
 					WHERE p1.post_type = 'wprm_recipe'"
 			);
 
-			set_transient( '_wl_main_ingredient_list_table__count', $count, 60 );
+			set_transient('_wl_main_ingredient_list_table__count', $count, 60);
 		}
 
 		return $count;
 	}
 
 	public function no_items() {
-		esc_html_e( 'No main ingredients found.', 'wordlift' );
+		esc_html_e('No main ingredients found.', 'wordlift');
 	}
 
 	public function get_columns() {
 		return array(
-			'ingredient_name' => __( 'Ingredient Name', 'wordlift' ),
-			'recipe_name'     => __( 'Recipe Name', 'wordlift' ),
-			'post_title'      => __( 'Post Title', 'wordlift' ),
-			'url'             => __( 'Post URL', 'wordlift' ),
+			'ingredient_name' => __('Ingredient Name', 'wordlift'),
+			'recipe_name'     => __('Recipe Name', 'wordlift'),
+			'post_title'      => __('Post Title', 'wordlift'),
+			'url'             => __('Post URL', 'wordlift'),
 			'actions'         => '',
 		);
 	}
 
-	public function column_ingredient_name( $item ) {
-		$recipe_json_ld = get_post_meta( $item->recipe_ID, '_wl_main_ingredient_jsonld', true ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-		$recipe         = json_decode( $recipe_json_ld, true );
+	public function column_ingredient_name($item) {
+		$recipe_json_ld = get_post_meta($item->recipe_ID, '_wl_main_ingredient_jsonld', true); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+		$recipe         = json_decode($recipe_json_ld, true);
 
 		return $recipe ? $recipe['name'] : 'null';
 	}
 
-	public function column_recipe_name( $item ) {
+	public function column_recipe_name($item) {
 		return $item->recipe_name;
 	}
 
-	public function column_post_title( $item ) {
-		return sprintf( '<a href="%s">%s</a>', get_edit_post_link( $item->post_ID ), $item->post_title );
+	public function column_post_title($item) {
+		return sprintf('<a href="%s">%s</a>', get_edit_post_link($item->post_ID), $item->post_title);
 	}
 
-	public function column_url( $item ) {
-		return get_permalink( $item->post_ID );
+	public function column_url($item) {
+		return get_permalink($item->post_ID);
 	}
 
-	public function column_actions( $item ) {
+	public function column_actions($item) {
 
 		$url = admin_url(
-			sprintf( 'admin.php?page=wl_ingredients&modal_window=true&id=%d&TB_iframe=true', $item->recipe_ID )  // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+			sprintf('admin.php?page=wl_ingredients&modal_window=true&id=%d&TB_iframe=true', $item->recipe_ID)  // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 		);
 
 		return sprintf(
 			'<a href="%s" class="button alignright thickbox open-plugin-details-modal" data-title="%s" type="button">%s</a>',
 			$url,
-			esc_attr( $item->post_title ),
-			esc_html__( 'JSON-LD', 'wordlift' )
+			esc_attr($item->post_title),
+			esc_html__('JSON-LD', 'wordlift')
 		);
 	}
 

src/modules/food-kg/includes/admin/partials/main_ingredient.php

Indentation +5 added lines, -5 removed lines

@@ -14,9 +14,9 @@
     </div>
 	<?php
 
-	// Prepare Table of elements
-	$main_ingredient_list_table = new Main_Ingredient_List_Table();
-	$main_ingredient_list_table->prepare_items();
-	$main_ingredient_list_table->display();
-	?>
+    // Prepare Table of elements
+    $main_ingredient_list_table = new Main_Ingredient_List_Table();
+    $main_ingredient_list_table->prepare_items();
+    $main_ingredient_list_table->display();
+    ?>
 </div>

Spacing +3 added lines, -3 removed lines

@@ -8,9 +8,9 @@
 
 <div class="wrap">
     <div class="wl-ingredients">
-        <h1><?php esc_html_e( 'Main Ingredients', 'wordlift' ); ?></h1>
-        <a href="<?php echo esc_url( admin_url( 'admin-ajax.php?action=wl_download_ingredients_data&_wpnonce=' . wp_create_nonce( 'wl-dl-ingredients-data-nonce' ) ) ); ?>"
-           class="wl-ingredients__btn-copy-table"><?php esc_html_e( 'Download Ingredients Data', 'wordlift' ); ?></a>
+        <h1><?php esc_html_e('Main Ingredients', 'wordlift'); ?></h1>
+        <a href="<?php echo esc_url(admin_url('admin-ajax.php?action=wl_download_ingredients_data&_wpnonce='.wp_create_nonce('wl-dl-ingredients-data-nonce'))); ?>"
+           class="wl-ingredients__btn-copy-table"><?php esc_html_e('Download Ingredients Data', 'wordlift'); ?></a>
     </div>
 	<?php
 

src/modules/food-kg/includes/admin/Download_Ingredients_Data.php

Indentation +63 added lines, -63 removed lines

@@ -4,22 +4,22 @@ 
 
 class Download_Ingredients_Data {
 
-	public function register_hooks() {
-		add_action( 'wp_ajax_wl_download_ingredients_data', array( $this, 'wl_download_ingredients_data' ) );
-	}
+    public function register_hooks() {
+        add_action( 'wp_ajax_wl_download_ingredients_data', array( $this, 'wl_download_ingredients_data' ) );
+    }
 
-	public function wl_download_ingredients_data() {
+    public function wl_download_ingredients_data() {
 
-		check_ajax_referer( 'wl-dl-ingredients-data-nonce' );
+        check_ajax_referer( 'wl-dl-ingredients-data-nonce' );
 
-		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_die( esc_html__( 'You do not have sufficient permissions to access this page.', 'wordlift' ) );
-		}
+        if ( ! current_user_can( 'manage_options' ) ) {
+            wp_die( esc_html__( 'You do not have sufficient permissions to access this page.', 'wordlift' ) );
+        }
 
-		global $wpdb;
+        global $wpdb;
 
-		$items = $wpdb->get_results(
-			"SELECT p1.ID AS recipe_ID,
+        $items = $wpdb->get_results(
+            "SELECT p1.ID AS recipe_ID,
 					    p1.post_title AS recipe_name,
 					    p2.ID AS post_ID,
 					    p2.post_title,
@@ -31,56 +31,56 @@ 
 					        ON p2.post_content LIKE CONCAT( '%<!--WPRM Recipe ', p1.ID,'-->%' )
 					            AND p2.post_status = 'publish'
 					WHERE p1.post_type = 'wprm_recipe'"
-		);
-
-		if ( ! $items ) {
-			wp_send_json_error( __( 'No main ingredients found.', 'wordlift' ) );
-		}
-
-		// Generate unique filename using current timestamp.
-		$filename = 'wl-main-ingredients-data-' . gmdate( 'Y-m-d-H-i-s' ) . '.tsv';
-
-		header( 'Content-Disposition: attachment; filename=' . $filename );
-		header( 'Content-Type: text/text/tab-separated-values; charset=' . get_bloginfo( 'charset' ) );
-
-		// Do not cache the file.
-		header( 'Pragma: no-cache' );
-		header( 'Expires: 0' );
-
-		$output = fopen( 'php://output', 'w' );
-
-		// Insert Header.
-		fputcsv(
-			$output,
-			array(
-				__( 'Ingredient Name', 'wordlift' ),
-				__( 'Recipe Name', 'wordlift' ),
-				__( 'Recipe ID', 'wordlift' ),
-				__( 'Post Name', 'wordlift' ),
-				__( 'Post ID', 'wordlift' ),
-				__( 'Post URL', 'wordlift' ),
-			),
-			"\t"
-		);
-
-		// Insert Data.
-		foreach ( $items as $item ) {
-			$recipe_json_ld = get_post_meta( $item->recipe_ID, '_wl_main_ingredient_jsonld', true ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-			$recipe         = json_decode( $recipe_json_ld, true );
-			fputcsv(
-				$output,
-				array(
-					$recipe ? $recipe['name'] : 'null',
-					$item->recipe_name,
-					$item->recipe_ID, // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-					$item->post_title,
-					$item->post_ID,
-					esc_url( get_the_permalink( $item->post_ID ) ),
-				),
-				"\t"
-			);
-		}
-
-		wp_die();
-	}
+        );
+
+        if ( ! $items ) {
+            wp_send_json_error( __( 'No main ingredients found.', 'wordlift' ) );
+        }
+
+        // Generate unique filename using current timestamp.
+        $filename = 'wl-main-ingredients-data-' . gmdate( 'Y-m-d-H-i-s' ) . '.tsv';
+
+        header( 'Content-Disposition: attachment; filename=' . $filename );
+        header( 'Content-Type: text/text/tab-separated-values; charset=' . get_bloginfo( 'charset' ) );
+
+        // Do not cache the file.
+        header( 'Pragma: no-cache' );
+        header( 'Expires: 0' );
+
+        $output = fopen( 'php://output', 'w' );
+
+        // Insert Header.
+        fputcsv(
+            $output,
+            array(
+                __( 'Ingredient Name', 'wordlift' ),
+                __( 'Recipe Name', 'wordlift' ),
+                __( 'Recipe ID', 'wordlift' ),
+                __( 'Post Name', 'wordlift' ),
+                __( 'Post ID', 'wordlift' ),
+                __( 'Post URL', 'wordlift' ),
+            ),
+            "\t"
+        );
+
+        // Insert Data.
+        foreach ( $items as $item ) {
+            $recipe_json_ld = get_post_meta( $item->recipe_ID, '_wl_main_ingredient_jsonld', true ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+            $recipe         = json_decode( $recipe_json_ld, true );
+            fputcsv(
+                $output,
+                array(
+                    $recipe ? $recipe['name'] : 'null',
+                    $item->recipe_name,
+                    $item->recipe_ID, // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+                    $item->post_title,
+                    $item->post_ID,
+                    esc_url( get_the_permalink( $item->post_ID ) ),
+                ),
+                "\t"
+            );
+        }
+
+        wp_die();
+    }
 }

Spacing +22 added lines, -22 removed lines

@@ -5,15 +5,15 @@ 
 class Download_Ingredients_Data {
 
 	public function register_hooks() {
-		add_action( 'wp_ajax_wl_download_ingredients_data', array( $this, 'wl_download_ingredients_data' ) );
+		add_action('wp_ajax_wl_download_ingredients_data', array($this, 'wl_download_ingredients_data'));
 	}
 
 	public function wl_download_ingredients_data() {
 
-		check_ajax_referer( 'wl-dl-ingredients-data-nonce' );
+		check_ajax_referer('wl-dl-ingredients-data-nonce');
 
-		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_die( esc_html__( 'You do not have sufficient permissions to access this page.', 'wordlift' ) );
+		if ( ! current_user_can('manage_options')) {
+			wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'wordlift'));
 		}
 
 		global $wpdb;
@@ -33,40 +33,40 @@ 
 					WHERE p1.post_type = 'wprm_recipe'"
 		);
 
-		if ( ! $items ) {
-			wp_send_json_error( __( 'No main ingredients found.', 'wordlift' ) );
+		if ( ! $items) {
+			wp_send_json_error(__('No main ingredients found.', 'wordlift'));
 		}
 
 		// Generate unique filename using current timestamp.
-		$filename = 'wl-main-ingredients-data-' . gmdate( 'Y-m-d-H-i-s' ) . '.tsv';
+		$filename = 'wl-main-ingredients-data-'.gmdate('Y-m-d-H-i-s').'.tsv';
 
-		header( 'Content-Disposition: attachment; filename=' . $filename );
-		header( 'Content-Type: text/text/tab-separated-values; charset=' . get_bloginfo( 'charset' ) );
+		header('Content-Disposition: attachment; filename='.$filename);
+		header('Content-Type: text/text/tab-separated-values; charset='.get_bloginfo('charset'));
 
 		// Do not cache the file.
-		header( 'Pragma: no-cache' );
-		header( 'Expires: 0' );
+		header('Pragma: no-cache');
+		header('Expires: 0');
 
-		$output = fopen( 'php://output', 'w' );
+		$output = fopen('php://output', 'w');
 
 		// Insert Header.
 		fputcsv(
 			$output,
 			array(
-				__( 'Ingredient Name', 'wordlift' ),
-				__( 'Recipe Name', 'wordlift' ),
-				__( 'Recipe ID', 'wordlift' ),
-				__( 'Post Name', 'wordlift' ),
-				__( 'Post ID', 'wordlift' ),
-				__( 'Post URL', 'wordlift' ),
+				__('Ingredient Name', 'wordlift'),
+				__('Recipe Name', 'wordlift'),
+				__('Recipe ID', 'wordlift'),
+				__('Post Name', 'wordlift'),
+				__('Post ID', 'wordlift'),
+				__('Post URL', 'wordlift'),
 			),
 			"\t"
 		);
 
 		// Insert Data.
-		foreach ( $items as $item ) {
-			$recipe_json_ld = get_post_meta( $item->recipe_ID, '_wl_main_ingredient_jsonld', true ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-			$recipe         = json_decode( $recipe_json_ld, true );
+		foreach ($items as $item) {
+			$recipe_json_ld = get_post_meta($item->recipe_ID, '_wl_main_ingredient_jsonld', true); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+			$recipe         = json_decode($recipe_json_ld, true);
 			fputcsv(
 				$output,
 				array(
@@ -75,7 +75,7 @@ 
 					$item->recipe_ID, // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 					$item->post_title,
 					$item->post_ID,
-					esc_url( get_the_permalink( $item->post_ID ) ),
+					esc_url(get_the_permalink($item->post_ID)),
 				),
 				"\t"
 			);