insideout10 / wordlift-plugin

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' );
+    }
 
 }

src/install/class-wordlift-install-3-50-1.php

Indentation +53 added lines, -53 removed lines

@@ -7,67 +7,67 @@
  */
 class Wordlift_Install_3_50_1 extends Wordlift_Install {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	protected static $version = '3.50.1';
+    /**
+     * {@inheritdoc}
+     */
+    protected static $version = '3.50.1';
 
-	/**
-	 * Is column exists
-	 *
-	 * @param $column_name
-	 *
-	 * @return mixed
-	 */
-	public static function is_column_exists( $column_name ) {
-		global $wpdb;
+    /**
+     * Is column exists
+     *
+     * @param $column_name
+     *
+     * @return mixed
+     */
+    public static function is_column_exists( $column_name ) {
+        global $wpdb;
 
-		return $wpdb->get_results(
-			$wpdb->prepare(
-				"SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name ='{$wpdb->prefix}wl_entities' AND column_name = %s",
-				$column_name
-			)
-		);
-	}
+        return $wpdb->get_results(
+            $wpdb->prepare(
+                "SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name ='{$wpdb->prefix}wl_entities' AND column_name = %s",
+                $column_name
+            )
+        );
+    }
 
-	/**
-	 * Install
-	 *
-	 * @return void
-	 */
-	public function install() {
-		global $wpdb;
+    /**
+     * Install
+     *
+     * @return void
+     */
+    public function install() {
+        global $wpdb;
 
-		// Check if 'match_name' column exists
-		if ( self::is_column_exists( 'match_name' ) ) {
-			return;
-		}
+        // Check if 'match_name' column exists
+        if ( self::is_column_exists( 'match_name' ) ) {
+            return;
+        }
 
-		// Add new 'match_name' column
-		dbDelta(
-			"ALTER TABLE {$wpdb->prefix}wl_entities
+        // Add new 'match_name' column
+        dbDelta(
+            "ALTER TABLE {$wpdb->prefix}wl_entities
 					ADD match_name VARCHAR(255) AFTER about_jsonld;"
-		);
+        );
 
-		// Get all rows with 'about_jsonld'
-		$results = $wpdb->get_results(
-			"SELECT id, about_jsonld FROM {$wpdb->prefix}wl_entities WHERE about_jsonld IS NOT NULL",
-			ARRAY_A
-		);
+        // Get all rows with 'about_jsonld'
+        $results = $wpdb->get_results(
+            "SELECT id, about_jsonld FROM {$wpdb->prefix}wl_entities WHERE about_jsonld IS NOT NULL",
+            ARRAY_A
+        );
 
-		// Update 'match_name' for each row
-		foreach ( $results as $row ) {
-			$match_name = Jsonld_Utils::get_about_match_name( $row['about_jsonld'] );
+        // Update 'match_name' for each row
+        foreach ( $results as $row ) {
+            $match_name = Jsonld_Utils::get_about_match_name( $row['about_jsonld'] );
 
-			if ( is_null( $match_name ) ) {
-				continue;
-			}
+            if ( is_null( $match_name ) ) {
+                continue;
+            }
 
-			$wpdb->update(
-				"{$wpdb->prefix}wl_entities",
-				array( 'match_name' => $match_name ),
-				array( 'id' => $row['id'] )
-			);
-		}
-	}
+            $wpdb->update(
+                "{$wpdb->prefix}wl_entities",
+                array( 'match_name' => $match_name ),
+                array( 'id' => $row['id'] )
+            );
+        }
+    }
 }

src/classes/jsonld/class-jsonld-utils.php

Indentation +14 added lines, -14 removed lines

@@ -4,19 +4,19 @@
 
 class Jsonld_Utils {
 
-	/**
-	 * Get about match name value
-	 *
-	 * @param $jsonld
-	 *
-	 * @return mixed|null
-	 */
-	public static function get_about_match_name( $jsonld ) {
-		$data = json_decode( $jsonld, true );
-		if ( ! $data || ! array_key_exists( 'name', $data ) ) {
-			return null;
-		}
+    /**
+     * Get about match name value
+     *
+     * @param $jsonld
+     *
+     * @return mixed|null
+     */
+    public static function get_about_match_name( $jsonld ) {
+        $data = json_decode( $jsonld, true );
+        if ( ! $data || ! array_key_exists( 'name', $data ) ) {
+            return null;
+        }
 
-		return $data['name'];
-	}
+        return $data['name'];
+    }
 }

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

Indentation +171 added lines, -171 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,
@@ -72,129 +72,129 @@ 
 			WHERE 1=1
 		";
 
-		$this->cursor();
-		$this->has_match();
-		$this->term_contains();
-		$this->taxonomies();
-		$this->group_by();
-		$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 );
-
-		$sort = ( $this->sort === 'ASC' ? SORT_ASC : SORT_DESC );
-		array_multisort( array_column( $items, $this->cursor_sort->get_sort_property() ), $sort, $items );
-
-		return $items;
-	}
-
-	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 group_by() {
-		$this->sql .= ' GROUP BY t.term_id';
-	}
-
-	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',
-			'entity_name' => 'match_name',
-			'occurrences' => 'occurrences',
-		);
-
-		$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->group_by();
+        $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 );
+
+        $sort = ( $this->sort === 'ASC' ? SORT_ASC : SORT_DESC );
+        array_multisort( array_column( $items, $this->cursor_sort->get_sort_property() ), $sort, $items );
+
+        return $items;
+    }
+
+    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 group_by() {
+        $this->sql .= ' GROUP BY t.term_id';
+    }
+
+    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',
+            'entity_name' => 'match_name',
+            'occurrences' => 'occurrences',
+        );
+
+        $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 ) . "' )";
+    }
 }

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

Indentation +100 added lines, -100 removed lines

@@ -12,119 +12,119 @@
 // 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 = Jsonld_Utils::get_about_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
-		 */
-		$query  = "UPDATE {$wpdb->prefix}wl_entities SET ";
-		$params = array();
-
-		if ( is_null( $value ) ) {
-			$query .= "about_jsonld = NULL, ";
-		} else {
-			$query    .= "about_jsonld = %s, ";
-			$params[] = $value;
-		}
-
-		if ( is_null( $match_name ) ) {
-			$query .= "match_name = NULL ";
-		} else {
-			$query    .= "match_name = %s ";
-			$params[] = $match_name;
-		}
-
-		$query    .= "WHERE content_id = %d AND content_type = %d";
-		$params[] = $content_id->get_id();
-		$params[] = $content_id->get_type();
-
-		return $wpdb->query( $wpdb->prepare( $query, $params ) );
-	}
+                $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 = Jsonld_Utils::get_about_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
+         */
+        $query  = "UPDATE {$wpdb->prefix}wl_entities SET ";
+        $params = array();
+
+        if ( is_null( $value ) ) {
+            $query .= "about_jsonld = NULL, ";
+        } else {
+            $query    .= "about_jsonld = %s, ";
+            $params[] = $value;
+        }
+
+        if ( is_null( $match_name ) ) {
+            $query .= "match_name = NULL ";
+        } else {
+            $query    .= "match_name = %s ";
+            $params[] = $match_name;
+        }
+
+        $query    .= "WHERE content_id = %d AND content_type = %d";
+        $params[] = $content_id->get_id();
+        $params[] = $content_id->get_type();
+
+        return $wpdb->query( $wpdb->prepare( $query, $params ) );
+    }
 }