insideout10 / wordlift-plugin

src/classes/content/wordpress/class-abstract-wordpress-content-service.php

Indentation +120 added lines, -120 removed lines

@@ -11,143 +11,143 @@
 // phpcs:ignore WordPress.WP.CapitalPDangit.MisspelledClassName
 abstract class Abstract_Wordpress_Content_Service implements Content_Service {
 
-	protected function __construct() {
+    protected function __construct() {
 
-	}
+    }
 
-	protected function get_dataset_uri() {
-		return trailingslashit( Wordlift_Configuration_Service::get_instance()->get_dataset_uri() );
-	}
+    protected function get_dataset_uri() {
+        return trailingslashit( Wordlift_Configuration_Service::get_instance()->get_dataset_uri() );
+    }
 
-	protected function is_absolute( $uri ) {
-		return 1 === preg_match( '@^https?://@', $uri );
-	}
+    protected function is_absolute( $uri ) {
+        return 1 === preg_match( '@^https?://@', $uri );
+    }
 
-	protected function is_internal( $uri ) {
-		$dataset_uri = $this->get_dataset_uri();
+    protected function is_internal( $uri ) {
+        $dataset_uri = $this->get_dataset_uri();
 
-		return ! empty( $dataset_uri ) && 0 === strpos( $uri, $dataset_uri );
-	}
+        return ! empty( $dataset_uri ) && 0 === strpos( $uri, $dataset_uri );
+    }
 
-	protected function make_absolute( $uri ) {
-		Assertions::not_empty( $this->get_dataset_uri(), '`dataset_uri` cannot be empty.' );
+    protected function make_absolute( $uri ) {
+        Assertions::not_empty( $this->get_dataset_uri(), '`dataset_uri` cannot be empty.' );
 
-		if ( 1 !== preg_match( '@^https?://@', $uri ) ) {
-			return $this->get_dataset_uri() . $uri;
-		}
+        if ( 1 !== preg_match( '@^https?://@', $uri ) ) {
+            return $this->get_dataset_uri() . $uri;
+        }
 
-		return $uri;
-	}
+        return $uri;
+    }
 
-	protected function make_relative( $uri ) {
-		$dataset_uri = $this->get_dataset_uri();
-		if ( 0 === strpos( $uri, $dataset_uri ) ) {
-			return substr( $uri, strlen( $dataset_uri ) );
-		}
+    protected function make_relative( $uri ) {
+        $dataset_uri = $this->get_dataset_uri();
+        if ( 0 === strpos( $uri, $dataset_uri ) ) {
+            return substr( $uri, strlen( $dataset_uri ) );
+        }
 
-		return $uri;
-	}
+        return $uri;
+    }
 
-	/**
-	 * @param Wordpress_Content_Id $content_id
-	 *
-	 * @return string|null
-	 */
-	public function get_about_jsonld( $content_id ) {
-		global $wpdb;
+    /**
+     * @param Wordpress_Content_Id $content_id
+     *
+     * @return string|null
+     */
+    public function get_about_jsonld( $content_id ) {
+        global $wpdb;
 
-		return $wpdb->get_var(
-			$wpdb->prepare(
-				"
+        return $wpdb->get_var(
+            $wpdb->prepare(
+                "
 			SELECT about_jsonld FROM {$wpdb->prefix}wl_entities
 			WHERE content_id = %d AND content_type = %d
 			",
-				$content_id->get_id(),
-				$content_id->get_type()
-			)
-		);
-	}
-
-	/**
-	 * @param Wordpress_Content_Id $content_id
-	 * @param string $value
-	 *
-	 * @throws Exception If the 'match_name' column does not exist in the database table.
-	 */
-	public function set_about_jsonld( $content_id, $value ) {
-		global $wpdb;
-
-		// Cleanup value.
-		$value      = ( is_string( $value ) && strlen( $value ) > 2 ) ? $value : null;
-		$match_name = "NULL";
-
-		if ( $value ) {
-			// Check if the 'match_name' column exists in the database table
-			$columns = $wpdb->get_col_info( 'name', 0 );
-			if ( in_array( 'match_name', $columns ) ) {
-				$match_name = $this->get_match_name( $value );
-			}
-		}
-
-		// This `hack` is necessary to ensure the entity exists in the entities table, but we
-		// should revise how this works really.
-		//
-		// This is currently needed because rel_uri is required in the table.
-		switch ( $content_id->get_type() ) {
-			case Object_Type_Enum::POST:
-				Wordpress_Dataset_Content_Service_Hooks::insert_post( $content_id->get_id() );
-				break;
-			case Object_Type_Enum::TERM:
-				Wordpress_Dataset_Content_Service_Hooks::created_term( $content_id->get_id() );
-				break;
-			case Object_Type_Enum::USER:
-				Wordpress_Dataset_Content_Service_Hooks::user_register( $content_id->get_id() );
-				break;
-		}
-
-		/**
-		 * As of May 16 2023, $wpdb:prepare doesnt support null
-		 * values in about_jsonld, this results in NULL values being populated
-		 * as `null` if we directly pass it to the prepare function(). So its necessary
-		 * to make the query conditional based on the $value
-		 */
-		if ( null === $value ) {
-			return $wpdb->query(
-				$wpdb->prepare(
-					"UPDATE {$wpdb->prefix}wl_entities
+                $content_id->get_id(),
+                $content_id->get_type()
+            )
+        );
+    }
+
+    /**
+     * @param Wordpress_Content_Id $content_id
+     * @param string $value
+     *
+     * @throws Exception If the 'match_name' column does not exist in the database table.
+     */
+    public function set_about_jsonld( $content_id, $value ) {
+        global $wpdb;
+
+        // Cleanup value.
+        $value      = ( is_string( $value ) && strlen( $value ) > 2 ) ? $value : null;
+        $match_name = "NULL";
+
+        if ( $value ) {
+            // Check if the 'match_name' column exists in the database table
+            $columns = $wpdb->get_col_info( 'name', 0 );
+            if ( in_array( 'match_name', $columns ) ) {
+                $match_name = $this->get_match_name( $value );
+            }
+        }
+
+        // This `hack` is necessary to ensure the entity exists in the entities table, but we
+        // should revise how this works really.
+        //
+        // This is currently needed because rel_uri is required in the table.
+        switch ( $content_id->get_type() ) {
+            case Object_Type_Enum::POST:
+                Wordpress_Dataset_Content_Service_Hooks::insert_post( $content_id->get_id() );
+                break;
+            case Object_Type_Enum::TERM:
+                Wordpress_Dataset_Content_Service_Hooks::created_term( $content_id->get_id() );
+                break;
+            case Object_Type_Enum::USER:
+                Wordpress_Dataset_Content_Service_Hooks::user_register( $content_id->get_id() );
+                break;
+        }
+
+        /**
+         * As of May 16 2023, $wpdb:prepare doesnt support null
+         * values in about_jsonld, this results in NULL values being populated
+         * as `null` if we directly pass it to the prepare function(). So its necessary
+         * to make the query conditional based on the $value
+         */
+        if ( null === $value ) {
+            return $wpdb->query(
+                $wpdb->prepare(
+                    "UPDATE {$wpdb->prefix}wl_entities
 					SET about_jsonld = NULL, match_name = %s
 					WHERE content_id = %d AND content_type = %d",
-					$match_name,
-					$content_id->get_id(),
-					$content_id->get_type()
-				)
-			);
-		}
-
-		return $wpdb->query(
-			$wpdb->prepare(
-				"UPDATE {$wpdb->prefix}wl_entities
+                    $match_name,
+                    $content_id->get_id(),
+                    $content_id->get_type()
+                )
+            );
+        }
+
+        return $wpdb->query(
+            $wpdb->prepare(
+                "UPDATE {$wpdb->prefix}wl_entities
 				SET about_jsonld = %s, match_name = %s
 				WHERE content_id = %d AND content_type = %d",
-				$value,
-				$match_name,
-				$content_id->get_id(),
-				$content_id->get_type()
-			)
-		);
-	}
-
-	/**
-	 * @param $jsonld
-	 *
-	 * @return mixed|null
-	 */
-	public function get_match_name( $jsonld ) {
-		$data = json_decode( $jsonld, true );
-		if ( ! $data || ! array_key_exists( 'name', $data ) ) {
-			return "NULL";
-		}
-
-		return $data['name'];
-	}
+                $value,
+                $match_name,
+                $content_id->get_id(),
+                $content_id->get_type()
+            )
+        );
+    }
+
+    /**
+     * @param $jsonld
+     *
+     * @return mixed|null
+     */
+    public function get_match_name( $jsonld ) {
+        $data = json_decode( $jsonld, true );
+        if ( ! $data || ! array_key_exists( 'name', $data ) ) {
+            return "NULL";
+        }
+
+        return $data['name'];
+    }
 }

Spacing +27 added lines, -27 removed lines

@@ -16,33 +16,33 @@ 
 	}
 
 	protected function get_dataset_uri() {
-		return trailingslashit( Wordlift_Configuration_Service::get_instance()->get_dataset_uri() );
+		return trailingslashit(Wordlift_Configuration_Service::get_instance()->get_dataset_uri());
 	}
 
-	protected function is_absolute( $uri ) {
-		return 1 === preg_match( '@^https?://@', $uri );
+	protected function is_absolute($uri) {
+		return 1 === preg_match('@^https?://@', $uri);
 	}
 
-	protected function is_internal( $uri ) {
+	protected function is_internal($uri) {
 		$dataset_uri = $this->get_dataset_uri();
 
-		return ! empty( $dataset_uri ) && 0 === strpos( $uri, $dataset_uri );
+		return ! empty($dataset_uri) && 0 === strpos($uri, $dataset_uri);
 	}
 
-	protected function make_absolute( $uri ) {
-		Assertions::not_empty( $this->get_dataset_uri(), '`dataset_uri` cannot be empty.' );
+	protected function make_absolute($uri) {
+		Assertions::not_empty($this->get_dataset_uri(), '`dataset_uri` cannot be empty.');
 
-		if ( 1 !== preg_match( '@^https?://@', $uri ) ) {
-			return $this->get_dataset_uri() . $uri;
+		if (1 !== preg_match('@^https?://@', $uri)) {
+			return $this->get_dataset_uri().$uri;
 		}
 
 		return $uri;
 	}
 
-	protected function make_relative( $uri ) {
+	protected function make_relative($uri) {
 		$dataset_uri = $this->get_dataset_uri();
-		if ( 0 === strpos( $uri, $dataset_uri ) ) {
-			return substr( $uri, strlen( $dataset_uri ) );
+		if (0 === strpos($uri, $dataset_uri)) {
+			return substr($uri, strlen($dataset_uri));
 		}
 
 		return $uri;
@@ -53,7 +53,7 @@ 
 	 *
 	 * @return string|null
 	 */
-	public function get_about_jsonld( $content_id ) {
+	public function get_about_jsonld($content_id) {
 		global $wpdb;
 
 		return $wpdb->get_var(
@@ -74,18 +74,18 @@ 
 	 *
 	 * @throws Exception If the 'match_name' column does not exist in the database table.
 	 */
-	public function set_about_jsonld( $content_id, $value ) {
+	public function set_about_jsonld($content_id, $value) {
 		global $wpdb;
 
 		// Cleanup value.
-		$value      = ( is_string( $value ) && strlen( $value ) > 2 ) ? $value : null;
+		$value      = (is_string($value) && strlen($value) > 2) ? $value : null;
 		$match_name = "NULL";
 
-		if ( $value ) {
+		if ($value) {
 			// Check if the 'match_name' column exists in the database table
-			$columns = $wpdb->get_col_info( 'name', 0 );
-			if ( in_array( 'match_name', $columns ) ) {
-				$match_name = $this->get_match_name( $value );
+			$columns = $wpdb->get_col_info('name', 0);
+			if (in_array('match_name', $columns)) {
+				$match_name = $this->get_match_name($value);
 			}
 		}
 
@@ -93,15 +93,15 @@ 
 		// should revise how this works really.
 		//
 		// This is currently needed because rel_uri is required in the table.
-		switch ( $content_id->get_type() ) {
+		switch ($content_id->get_type()) {
 			case Object_Type_Enum::POST:
-				Wordpress_Dataset_Content_Service_Hooks::insert_post( $content_id->get_id() );
+				Wordpress_Dataset_Content_Service_Hooks::insert_post($content_id->get_id());
 				break;
 			case Object_Type_Enum::TERM:
-				Wordpress_Dataset_Content_Service_Hooks::created_term( $content_id->get_id() );
+				Wordpress_Dataset_Content_Service_Hooks::created_term($content_id->get_id());
 				break;
 			case Object_Type_Enum::USER:
-				Wordpress_Dataset_Content_Service_Hooks::user_register( $content_id->get_id() );
+				Wordpress_Dataset_Content_Service_Hooks::user_register($content_id->get_id());
 				break;
 		}
 
@@ -111,7 +111,7 @@ 
 		 * as `null` if we directly pass it to the prepare function(). So its necessary
 		 * to make the query conditional based on the $value
 		 */
-		if ( null === $value ) {
+		if (null === $value) {
 			return $wpdb->query(
 				$wpdb->prepare(
 					"UPDATE {$wpdb->prefix}wl_entities
@@ -142,9 +142,9 @@ 
 	 *
 	 * @return mixed|null
 	 */
-	public function get_match_name( $jsonld ) {
-		$data = json_decode( $jsonld, true );
-		if ( ! $data || ! array_key_exists( 'name', $data ) ) {
+	public function get_match_name($jsonld) {
+		$data = json_decode($jsonld, true);
+		if ( ! $data || ! array_key_exists('name', $data)) {
 			return "NULL";
 		}
 

src/modules/dashboard/includes/Term_Entity_Match/Term_Query.php

Indentation +199 added lines, -199 removed lines

@@ -7,52 +7,52 @@ 
 use WP_REST_Request;
 
 class Term_Query {
-	/**
-	 * @var WP_REST_Request
-	 */
-	private $request;
-	/**
-	 * @var mixed
-	 */
-	private $position;
-	/**
-	 * @var mixed
-	 */
-	private $element;
-	/**
-	 * @var mixed
-	 */
-	private $direction;
-
-	private $sort;
-
-	private $sortby;
-	/**
-	 * @var mixed
-	 */
-	private $limit;
-
-	/** @var Cursor_Sort $cursor_sort */
-	private $cursor_sort;
-
-	/**
-	 * @param WP_REST_Request $request
-	 * @param Cursor $cursor
-	 */
-	public function __construct( $request, $cursor, $cursor_sort, $limit ) {
-		global $wpdb;
-
-		$this->request     = $request;
-		$this->position    = $cursor->get_position();
-		$this->element     = $cursor->get_element();
-		$this->direction   = $cursor->get_direction();
-		$this->limit       = $limit;
-		$this->cursor_sort = $cursor_sort;
-
-		$this->set_sort();
-
-		// the `term_name` is required for sort.
-		$this->sql = "
+    /**
+     * @var WP_REST_Request
+     */
+    private $request;
+    /**
+     * @var mixed
+     */
+    private $position;
+    /**
+     * @var mixed
+     */
+    private $element;
+    /**
+     * @var mixed
+     */
+    private $direction;
+
+    private $sort;
+
+    private $sortby;
+    /**
+     * @var mixed
+     */
+    private $limit;
+
+    /** @var Cursor_Sort $cursor_sort */
+    private $cursor_sort;
+
+    /**
+     * @param WP_REST_Request $request
+     * @param Cursor $cursor
+     */
+    public function __construct( $request, $cursor, $cursor_sort, $limit ) {
+        global $wpdb;
+
+        $this->request     = $request;
+        $this->position    = $cursor->get_position();
+        $this->element     = $cursor->get_element();
+        $this->direction   = $cursor->get_direction();
+        $this->limit       = $limit;
+        $this->cursor_sort = $cursor_sort;
+
+        $this->set_sort();
+
+        // the `term_name` is required for sort.
+        $this->sql = "
 			SELECT t.term_id as id,
 				e.about_jsonld as match_jsonld,
 				t.name,
@@ -66,157 +66,157 @@ 
 			WHERE 1=1
 		";
 
-		$this->cursor();
-		$this->has_match();
-		$this->term_contains();
-		$this->taxonomies();
-		$this->sort();
-		$this->limit();
-
-	}
-
-	public function get_results() {
-		global $wpdb;
-
-		// The `sql` is prepared in each delegated function in this class.
-		// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
-		$items = $wpdb->get_results( $this->sql );
-
-		// Mapping elements to add match_name
-		$items = array_map( array( $this, 'map_item' ), $items );
-
-		$sort = ( $this->sort === 'ASC' ? SORT_ASC : SORT_DESC );
-
-		// Sorting functions for specific fields
-		$sort_functions = array(
-			'match_name' => function ( $a, $b ) use ( $sort ) {
-				return $sort === SORT_ASC ? strcmp( $a->match_name, $b->match_name ) : strcmp( $b->match_name, $a->match_name );
-			},
-			// Add more specific sorting functions for other fields here
-		);
-
-		// Check if a specific sorting function exists for the sortby field, otherwise use the default sorting
-		if ( array_key_exists( $this->sortby, $sort_functions ) ) {
-			usort( $items, $sort_functions[ $this->sortby ] );
-		} else {
-			// Use the original sorting method for other keys
-			array_multisort( array_column( $items, $this->cursor_sort->get_sort_property() ), $sort, $items );
-		}
-
-		return $items;
-	}
-
-	public function map_item( $item ) {
-		$item->match_name = $this->get_match_name( $item->match_jsonld );
-
-		return $item;
-	}
-
-	private function get_match_name( $jsonld ) {
-		$data = json_decode( $jsonld, true );
-		if ( ! $data || ! array_key_exists( 'name', $data ) ) {
-			return null;
-		}
-
-		return $data['name'];
-	}
-
-	private function post_types() {
-		$post_types = $this->request->has_param( 'post_types' )
-			? (array) $this->request->get_param( 'post_types' )
-			: array( 'post', 'page' );
-		$value      = array_map( 'esc_sql', $post_types );
-		$this->sql  .= " AND p.post_type IN ( '" . implode( "', '", $value ) . "' )";
-	}
-
-	private function limit() {
-		$value     = is_numeric( $this->limit ) ? $this->limit : 10;
-		$this->sql .= ' LIMIT ' . esc_sql( $value );
-	}
-
-	private function has_match() {
-		if ( ! $this->request->has_param( 'has_match' ) ) {
-			return;
-		}
-
-		$value = (bool) $this->request->get_param( 'has_match' );
-
-		if ( $value ) {
-			$this->sql .= ' AND e.about_jsonld IS NOT NULL';
-		} else {
-			$this->sql .= ' AND e.about_jsonld IS NULL';
-		}
-	}
-
-	private function sort() {
-		switch ( $this->direction . '$' . $this->sort ) {
-			case 'ASCENDING$ASC':
-			case 'DESCENDING$DESC':
-				$sort = 'ASC';
-				break;
-			case 'ASCENDING$DESC':
-			case 'DESCENDING$ASC':
-				$sort = 'DESC';
-				break;
-		}
-
-		$this->sql .= ' ORDER BY t.' . $this->sortby . ' ' . $sort;
-	}
-
-	private function cursor() {
-		if ( ! isset( $this->position ) ) {
-			return;
-		}
-
-		switch ( $this->direction . '$' . $this->sort ) {
-			case 'ASCENDING$ASC':
-			case 'DESCENDING$DESC':
-				$condition = '>';
-				break;
-			case 'ASCENDING$DESC':
-			case 'DESCENDING$ASC':
-				$condition = '<';
-				break;
-		}
-
-		$condition .= ( $this->element === 'INCLUDED' ? '=' : '' );
-		global $wpdb;
-		// We control the vars in this method.
-		// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
-		$this->sql .= $wpdb->prepare( ' AND t.' . esc_sql( $this->sortby ) . ' ' . $condition . ' %s', $this->position );
-	}
-
-	private function set_sort() {
-		$sortby_to_col = array(
-			// sort param  col
-			'term_name'  => 'name',
-			'match_name' => 'match_name',
-		);
-
-		$value = $this->request->has_param( 'sort' )
-			? $this->request->get_param( 'sort' )
-			: '+term_name';
-
-		$sortby       = substr( $value, 1 );
-		$this->sortby = isset( $sortby_to_col[ $sortby ] ) ? $sortby_to_col[ $sortby ] : $sortby;
-		$this->sort   = substr( $value, 0, 1 ) === '+' ? 'ASC' : 'DESC';
-	}
-
-	private function term_contains() {
-		if ( ! $this->request->has_param( 'term_contains' ) ) {
-			return;
-		}
-
-		global $wpdb;
-		$value     = $this->request->get_param( 'term_contains' );
-		$this->sql .= $wpdb->prepare( ' and t.name LIKE %s', '%' . esc_sql( $value ) . '%' );
-	}
-
-	private function taxonomies() {
-		$taxonomies = $this->request->has_param( 'taxonomies' )
-			? (array) $this->request->get_param( 'taxonomies' )
-			: array( 'post_tag', 'category' );
-		$value      = array_map( 'esc_sql', $taxonomies );
-		$this->sql  .= " AND tt.taxonomy IN ( '" . implode( "', '", $value ) . "' )";
-	}
+        $this->cursor();
+        $this->has_match();
+        $this->term_contains();
+        $this->taxonomies();
+        $this->sort();
+        $this->limit();
+
+    }
+
+    public function get_results() {
+        global $wpdb;
+
+        // The `sql` is prepared in each delegated function in this class.
+        // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+        $items = $wpdb->get_results( $this->sql );
+
+        // Mapping elements to add match_name
+        $items = array_map( array( $this, 'map_item' ), $items );
+
+        $sort = ( $this->sort === 'ASC' ? SORT_ASC : SORT_DESC );
+
+        // Sorting functions for specific fields
+        $sort_functions = array(
+            'match_name' => function ( $a, $b ) use ( $sort ) {
+                return $sort === SORT_ASC ? strcmp( $a->match_name, $b->match_name ) : strcmp( $b->match_name, $a->match_name );
+            },
+            // Add more specific sorting functions for other fields here
+        );
+
+        // Check if a specific sorting function exists for the sortby field, otherwise use the default sorting
+        if ( array_key_exists( $this->sortby, $sort_functions ) ) {
+            usort( $items, $sort_functions[ $this->sortby ] );
+        } else {
+            // Use the original sorting method for other keys
+            array_multisort( array_column( $items, $this->cursor_sort->get_sort_property() ), $sort, $items );
+        }
+
+        return $items;
+    }
+
+    public function map_item( $item ) {
+        $item->match_name = $this->get_match_name( $item->match_jsonld );
+
+        return $item;
+    }
+
+    private function get_match_name( $jsonld ) {
+        $data = json_decode( $jsonld, true );
+        if ( ! $data || ! array_key_exists( 'name', $data ) ) {
+            return null;
+        }
+
+        return $data['name'];
+    }
+
+    private function post_types() {
+        $post_types = $this->request->has_param( 'post_types' )
+            ? (array) $this->request->get_param( 'post_types' )
+            : array( 'post', 'page' );
+        $value      = array_map( 'esc_sql', $post_types );
+        $this->sql  .= " AND p.post_type IN ( '" . implode( "', '", $value ) . "' )";
+    }
+
+    private function limit() {
+        $value     = is_numeric( $this->limit ) ? $this->limit : 10;
+        $this->sql .= ' LIMIT ' . esc_sql( $value );
+    }
+
+    private function has_match() {
+        if ( ! $this->request->has_param( 'has_match' ) ) {
+            return;
+        }
+
+        $value = (bool) $this->request->get_param( 'has_match' );
+
+        if ( $value ) {
+            $this->sql .= ' AND e.about_jsonld IS NOT NULL';
+        } else {
+            $this->sql .= ' AND e.about_jsonld IS NULL';
+        }
+    }
+
+    private function sort() {
+        switch ( $this->direction . '$' . $this->sort ) {
+            case 'ASCENDING$ASC':
+            case 'DESCENDING$DESC':
+                $sort = 'ASC';
+                break;
+            case 'ASCENDING$DESC':
+            case 'DESCENDING$ASC':
+                $sort = 'DESC';
+                break;
+        }
+
+        $this->sql .= ' ORDER BY t.' . $this->sortby . ' ' . $sort;
+    }
+
+    private function cursor() {
+        if ( ! isset( $this->position ) ) {
+            return;
+        }
+
+        switch ( $this->direction . '$' . $this->sort ) {
+            case 'ASCENDING$ASC':
+            case 'DESCENDING$DESC':
+                $condition = '>';
+                break;
+            case 'ASCENDING$DESC':
+            case 'DESCENDING$ASC':
+                $condition = '<';
+                break;
+        }
+
+        $condition .= ( $this->element === 'INCLUDED' ? '=' : '' );
+        global $wpdb;
+        // We control the vars in this method.
+        // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+        $this->sql .= $wpdb->prepare( ' AND t.' . esc_sql( $this->sortby ) . ' ' . $condition . ' %s', $this->position );
+    }
+
+    private function set_sort() {
+        $sortby_to_col = array(
+            // sort param  col
+            'term_name'  => 'name',
+            'match_name' => 'match_name',
+        );
+
+        $value = $this->request->has_param( 'sort' )
+            ? $this->request->get_param( 'sort' )
+            : '+term_name';
+
+        $sortby       = substr( $value, 1 );
+        $this->sortby = isset( $sortby_to_col[ $sortby ] ) ? $sortby_to_col[ $sortby ] : $sortby;
+        $this->sort   = substr( $value, 0, 1 ) === '+' ? 'ASC' : 'DESC';
+    }
+
+    private function term_contains() {
+        if ( ! $this->request->has_param( 'term_contains' ) ) {
+            return;
+        }
+
+        global $wpdb;
+        $value     = $this->request->get_param( 'term_contains' );
+        $this->sql .= $wpdb->prepare( ' and t.name LIKE %s', '%' . esc_sql( $value ) . '%' );
+    }
+
+    private function taxonomies() {
+        $taxonomies = $this->request->has_param( 'taxonomies' )
+            ? (array) $this->request->get_param( 'taxonomies' )
+            : array( 'post_tag', 'category' );
+        $value      = array_map( 'esc_sql', $taxonomies );
+        $this->sql  .= " AND tt.taxonomy IN ( '" . implode( "', '", $value ) . "' )";
+    }
 }

Spacing +43 added lines, -43 removed lines

@@ -39,7 +39,7 @@ 
 	 * @param WP_REST_Request $request
 	 * @param Cursor $cursor
 	 */
-	public function __construct( $request, $cursor, $cursor_sort, $limit ) {
+	public function __construct($request, $cursor, $cursor_sort, $limit) {
 		global $wpdb;
 
 		$this->request     = $request;
@@ -80,41 +80,41 @@ 
 
 		// The `sql` is prepared in each delegated function in this class.
 		// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
-		$items = $wpdb->get_results( $this->sql );
+		$items = $wpdb->get_results($this->sql);
 
 		// Mapping elements to add match_name
-		$items = array_map( array( $this, 'map_item' ), $items );
+		$items = array_map(array($this, 'map_item'), $items);
 
-		$sort = ( $this->sort === 'ASC' ? SORT_ASC : SORT_DESC );
+		$sort = ($this->sort === 'ASC' ? SORT_ASC : SORT_DESC);
 
 		// Sorting functions for specific fields
 		$sort_functions = array(
-			'match_name' => function ( $a, $b ) use ( $sort ) {
-				return $sort === SORT_ASC ? strcmp( $a->match_name, $b->match_name ) : strcmp( $b->match_name, $a->match_name );
+			'match_name' => function($a, $b) use ($sort) {
+				return $sort === SORT_ASC ? strcmp($a->match_name, $b->match_name) : strcmp($b->match_name, $a->match_name);
 			},
 			// Add more specific sorting functions for other fields here
 		);
 
 		// Check if a specific sorting function exists for the sortby field, otherwise use the default sorting
-		if ( array_key_exists( $this->sortby, $sort_functions ) ) {
-			usort( $items, $sort_functions[ $this->sortby ] );
+		if (array_key_exists($this->sortby, $sort_functions)) {
+			usort($items, $sort_functions[$this->sortby]);
 		} else {
 			// Use the original sorting method for other keys
-			array_multisort( array_column( $items, $this->cursor_sort->get_sort_property() ), $sort, $items );
+			array_multisort(array_column($items, $this->cursor_sort->get_sort_property()), $sort, $items);
 		}
 
 		return $items;
 	}
 
-	public function map_item( $item ) {
-		$item->match_name = $this->get_match_name( $item->match_jsonld );
+	public function map_item($item) {
+		$item->match_name = $this->get_match_name($item->match_jsonld);
 
 		return $item;
 	}
 
-	private function get_match_name( $jsonld ) {
-		$data = json_decode( $jsonld, true );
-		if ( ! $data || ! array_key_exists( 'name', $data ) ) {
+	private function get_match_name($jsonld) {
+		$data = json_decode($jsonld, true);
+		if ( ! $data || ! array_key_exists('name', $data)) {
 			return null;
 		}
 
@@ -122,26 +122,26 @@ 
 	}
 
 	private function post_types() {
-		$post_types = $this->request->has_param( 'post_types' )
-			? (array) $this->request->get_param( 'post_types' )
-			: array( 'post', 'page' );
-		$value      = array_map( 'esc_sql', $post_types );
-		$this->sql  .= " AND p.post_type IN ( '" . implode( "', '", $value ) . "' )";
+		$post_types = $this->request->has_param('post_types')
+			? (array) $this->request->get_param('post_types')
+			: array('post', 'page');
+		$value      = array_map('esc_sql', $post_types);
+		$this->sql .= " AND p.post_type IN ( '".implode("', '", $value)."' )";
 	}
 
 	private function limit() {
-		$value     = is_numeric( $this->limit ) ? $this->limit : 10;
-		$this->sql .= ' LIMIT ' . esc_sql( $value );
+		$value = is_numeric($this->limit) ? $this->limit : 10;
+		$this->sql .= ' LIMIT '.esc_sql($value);
 	}
 
 	private function has_match() {
-		if ( ! $this->request->has_param( 'has_match' ) ) {
+		if ( ! $this->request->has_param('has_match')) {
 			return;
 		}
 
-		$value = (bool) $this->request->get_param( 'has_match' );
+		$value = (bool) $this->request->get_param('has_match');
 
-		if ( $value ) {
+		if ($value) {
 			$this->sql .= ' AND e.about_jsonld IS NOT NULL';
 		} else {
 			$this->sql .= ' AND e.about_jsonld IS NULL';
@@ -149,7 +149,7 @@ 
 	}
 
 	private function sort() {
-		switch ( $this->direction . '$' . $this->sort ) {
+		switch ($this->direction.'$'.$this->sort) {
 			case 'ASCENDING$ASC':
 			case 'DESCENDING$DESC':
 				$sort = 'ASC';
@@ -160,15 +160,15 @@ 
 				break;
 		}
 
-		$this->sql .= ' ORDER BY t.' . $this->sortby . ' ' . $sort;
+		$this->sql .= ' ORDER BY t.'.$this->sortby.' '.$sort;
 	}
 
 	private function cursor() {
-		if ( ! isset( $this->position ) ) {
+		if ( ! isset($this->position)) {
 			return;
 		}
 
-		switch ( $this->direction . '$' . $this->sort ) {
+		switch ($this->direction.'$'.$this->sort) {
 			case 'ASCENDING$ASC':
 			case 'DESCENDING$DESC':
 				$condition = '>';
@@ -179,11 +179,11 @@ 
 				break;
 		}
 
-		$condition .= ( $this->element === 'INCLUDED' ? '=' : '' );
+		$condition .= ($this->element === 'INCLUDED' ? '=' : '');
 		global $wpdb;
 		// We control the vars in this method.
 		// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
-		$this->sql .= $wpdb->prepare( ' AND t.' . esc_sql( $this->sortby ) . ' ' . $condition . ' %s', $this->position );
+		$this->sql .= $wpdb->prepare(' AND t.'.esc_sql($this->sortby).' '.$condition.' %s', $this->position);
 	}
 
 	private function set_sort() {
@@ -193,30 +193,30 @@ 
 			'match_name' => 'match_name',
 		);
 
-		$value = $this->request->has_param( 'sort' )
-			? $this->request->get_param( 'sort' )
+		$value = $this->request->has_param('sort')
+			? $this->request->get_param('sort')
 			: '+term_name';
 
-		$sortby       = substr( $value, 1 );
-		$this->sortby = isset( $sortby_to_col[ $sortby ] ) ? $sortby_to_col[ $sortby ] : $sortby;
-		$this->sort   = substr( $value, 0, 1 ) === '+' ? 'ASC' : 'DESC';
+		$sortby       = substr($value, 1);
+		$this->sortby = isset($sortby_to_col[$sortby]) ? $sortby_to_col[$sortby] : $sortby;
+		$this->sort   = substr($value, 0, 1) === '+' ? 'ASC' : 'DESC';
 	}
 
 	private function term_contains() {
-		if ( ! $this->request->has_param( 'term_contains' ) ) {
+		if ( ! $this->request->has_param('term_contains')) {
 			return;
 		}
 
 		global $wpdb;
-		$value     = $this->request->get_param( 'term_contains' );
-		$this->sql .= $wpdb->prepare( ' and t.name LIKE %s', '%' . esc_sql( $value ) . '%' );
+		$value = $this->request->get_param('term_contains');
+		$this->sql .= $wpdb->prepare(' and t.name LIKE %s', '%'.esc_sql($value).'%');
 	}
 
 	private function taxonomies() {
-		$taxonomies = $this->request->has_param( 'taxonomies' )
-			? (array) $this->request->get_param( 'taxonomies' )
-			: array( 'post_tag', 'category' );
-		$value      = array_map( 'esc_sql', $taxonomies );
-		$this->sql  .= " AND tt.taxonomy IN ( '" . implode( "', '", $value ) . "' )";
+		$taxonomies = $this->request->has_param('taxonomies')
+			? (array) $this->request->get_param('taxonomies')
+			: array('post_tag', 'category');
+		$value      = array_map('esc_sql', $taxonomies);
+		$this->sql .= " AND tt.taxonomy IN ( '".implode("', '", $value)."' )";
 	}
 }

src/wordlift.php

Spacing +71 added lines, -71 removed lines

@@ -31,26 +31,26 @@ 
 use Wordlift\Features\Features_Registry;
 use Wordlift\Post\Post_Adapter;
 
-define( 'WORDLIFT_PLUGIN_FILE', __FILE__ );
-define( 'WORDLIFT_VERSION', '3.50.1-0' );
+define('WORDLIFT_PLUGIN_FILE', __FILE__);
+define('WORDLIFT_VERSION', '3.50.1-0');
 
 // ## DO NOT REMOVE THIS LINE: WHITELABEL PLACEHOLDER ##
 
-require_once plugin_dir_path( __FILE__ ) . '/libraries/action-scheduler/action-scheduler.php';
-require_once __DIR__ . '/modules/common/load.php';
-require_once __DIR__ . '/modules/app/load.php';
-require_once __DIR__ . '/modules/include-exclude/load.php';
+require_once plugin_dir_path(__FILE__).'/libraries/action-scheduler/action-scheduler.php';
+require_once __DIR__.'/modules/common/load.php';
+require_once __DIR__.'/modules/app/load.php';
+require_once __DIR__.'/modules/include-exclude/load.php';
 
 /**
  * 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.
@@ -60,15 +60,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__ ) . 'classes/features/index.php';
+require_once plugin_dir_path(__FILE__).'classes/features/index.php';
 
 /**
  * The code that runs during plugin activation.
@@ -76,11 +76,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();
 
 	/**
@@ -100,8 +100,8 @@ 
 	 */
 	Top_Entities::activate();
 
-	if ( ! wp_next_scheduled( 'wl_daily_cron' ) ) {
-		wp_schedule_event( time(), 'daily', 'wl_daily_cron' );
+	if ( ! wp_next_scheduled('wl_daily_cron')) {
+		wp_schedule_event(time(), 'daily', 'wl_daily_cron');
 	}
 
 }
@@ -112,7 +112,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();
@@ -128,18 +128,18 @@ 
 	Key_Validation_Notice::remove_notification_flag();
 	flush_rewrite_rules();
 
-	wp_clear_scheduled_hook( 'wl_daily_cron' );
+	wp_clear_scheduled_hook('wl_daily_cron');
 
 }
 
-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.
@@ -159,12 +159,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
@@ -174,10 +174,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();
@@ -194,7 +194,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();
@@ -205,27 +205,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__ ) . 'classes/dataset/index.php';
-			require_once plugin_dir_path( __FILE__ ) . 'classes/shipping-data/index.php';
+			require_once plugin_dir_path(__FILE__).'classes/dataset/index.php';
+			require_once plugin_dir_path(__FILE__).'classes/shipping-data/index.php';
 
 			/*
 			* Require the Entity annotation cleanup module.
 			*
 			* @since 3.34.6
 			*/
-			require_once plugin_dir_path( __FILE__ ) . 'classes/cleanup/index.php';
+			require_once plugin_dir_path(__FILE__).'classes/cleanup/index.php';
 
 			/*
 			* Import LOD entities.
 			*
 			* @since 3.35.0
 			*/
-			require_once plugin_dir_path( __FILE__ ) . 'classes/lod-import/index.php';
+			require_once plugin_dir_path(__FILE__).'classes/lod-import/index.php';
 
 		}
 	);
@@ -243,31 +243,31 @@ 
 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( '|^wordlift\\\\(?:(.*)\\\\)?(.+?)$|', $class_name_lc, $matches );
+			preg_match('|^wordlift\\\\(?:(.*)\\\\)?(.+?)$|', $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__ ) . 'classes' . DIRECTORY_SEPARATOR . $path . DIRECTORY_SEPARATOR . $file;
+			$full_path = plugin_dir_path(__FILE__).'classes'.DIRECTORY_SEPARATOR.$path.DIRECTORY_SEPARATOR.$file;
 
-			if ( ! file_exists( $full_path ) ) {
+			if ( ! file_exists($full_path)) {
 				return false;
 			}
 
 			try {
 				require_once $full_path;
-			} catch ( Exception $e ) {
+			} catch (Exception $e) {
 				// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log
-				error_log( "[WordLift] $full_path not found, cannot include." );
+				error_log("[WordLift] $full_path not found, cannot include.");
 			}
 
 			return true;
@@ -276,13 +276,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'),
 			),
 		)
 	);
@@ -292,49 +292,49 @@ 
  * 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/gardening-kg/load.php';
-require_once __DIR__ . '/modules/acf4so/load.php';
-require_once __DIR__ . '/modules/dashboard/load.php';
-require_once __DIR__ . '/modules/pods/load.php';
-require_once __DIR__ . '/modules/include-exclude-push-config/load.php';
-require_once __DIR__ . '/modules/super-resolution/load.php';
-require_once __DIR__ . '/modules/redeem-code/load.php';
-require_once __DIR__ . '/modules/raptive-setup/load.php';
-require_once __DIR__ . '/modules/events/load.php';
-
-function _wl_update_plugins_raptive_domain( $update, $plugin_data, $plugin_file ) {
+require_once __DIR__.'/modules/food-kg/load.php';
+require_once __DIR__.'/modules/gardening-kg/load.php';
+require_once __DIR__.'/modules/acf4so/load.php';
+require_once __DIR__.'/modules/dashboard/load.php';
+require_once __DIR__.'/modules/pods/load.php';
+require_once __DIR__.'/modules/include-exclude-push-config/load.php';
+require_once __DIR__.'/modules/super-resolution/load.php';
+require_once __DIR__.'/modules/redeem-code/load.php';
+require_once __DIR__.'/modules/raptive-setup/load.php';
+require_once __DIR__.'/modules/events/load.php';
+
+function _wl_update_plugins_raptive_domain($update, $plugin_data, $plugin_file) {
 	// Bail out if it's not our plugin.
 	$update_uri = $plugin_data['UpdateURI'];
-	if ( 'wordlift/wordlift.php' !== $plugin_file || ! isset( $update_uri ) ) {
+	if ('wordlift/wordlift.php' !== $plugin_file || ! isset($update_uri)) {
 		return $update;
 	}
 
-	$response = wp_remote_get( "$update_uri?nocache=" . time() );
+	$response = wp_remote_get("$update_uri?nocache=".time());
 
-	if ( is_wp_error( $response ) ) {
+	if (is_wp_error($response)) {
 		return $update;
 	}
 
 	try {
-		return json_decode( wp_remote_retrieve_body( $response ) );
-	} catch ( Exception $e ) {
+		return json_decode(wp_remote_retrieve_body($response));
+	} catch (Exception $e) {
 		return $update;
 	}
 }

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

Indentation +193 added lines, -193 removed lines

@@ -18,201 +18,201 @@
  */
 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';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-39-1.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-40-1.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-40-2.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-41-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-42-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-44-1.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-44-4.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-45-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-45-1.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-50-1.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';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-39-1.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-40-1.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-40-2.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-41-0.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-42-0.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-44-1.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-44-4.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-45-0.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-45-1.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-50-1.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(),
-			new Wordlift_Install_3_39_1(),
-
-			// See #1621.
-			new Wordlift_Install_3_40_1(),
-
-			// @link https://github.com/insideout10/wordlift-plugin/issues/1627
-			new Wordlift_Install_3_40_2(),
-
-			new Wordlift_Install_3_41_0(),
-			new Wordlift_Install_3_42_0(),
-
-			new Wordlift_Install_3_44_1(),
-			new Wordlift_Install_3_44_4(),
-
-			new Wordlift_Install_3_45_0(),
-			new Wordlift_Install_3_45_1(),
-
-			new Wordlift_Install_3_50_1(),
-		);
-		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;
-	}
+            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(),
+            new Wordlift_Install_3_39_1(),
+
+            // See #1621.
+            new Wordlift_Install_3_40_1(),
+
+            // @link https://github.com/insideout10/wordlift-plugin/issues/1627
+            new Wordlift_Install_3_40_2(),
+
+            new Wordlift_Install_3_41_0(),
+            new Wordlift_Install_3_42_0(),
+
+            new Wordlift_Install_3_44_1(),
+            new Wordlift_Install_3_44_4(),
+
+            new Wordlift_Install_3_45_0(),
+            new Wordlift_Install_3_45_1(),
+
+            new Wordlift_Install_3_50_1(),
+        );
+        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' );
-	}
+    /**
+     * Retrieve the current db version.
+     *
+     * @return type
+     */
+    private function get_current_version() {
+        return get_option( 'wl_db_version', '0.0.0' );
+    }
 
 }

Spacing +48 added lines, -48 removed lines

@@ -49,38 +49,38 @@ 
 	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-3-39-1.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-40-1.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-40-2.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-41-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-42-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-44-1.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-44-4.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-45-0.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-45-1.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-50-1.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';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-39-1.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-40-1.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-40-2.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-41-0.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-42-0.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-44-1.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-44-4.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-45-0.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-45-1.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-50-1.php';
 
 		// Get the install services.
 		$this->installs = array(
@@ -133,9 +133,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'));
 
 	}
 
@@ -161,30 +161,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');
 
 		}
 
@@ -193,12 +193,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;
 			}
 		}
@@ -212,7 +212,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');
 	}
 
 }