insideout10 / wordlift-plugin

src/install/class-wordlift-install-3-44-4.php

Indentation +11 added lines, -11 removed lines

@@ -10,23 +10,23 @@
  */
 class Wordlift_Install_3_44_4 extends Wordlift_Install {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	protected static $version = '3.44.4';
+    /**
+     * {@inheritdoc}
+     */
+    protected static $version = '3.44.4';
 
-	public function install() {
+    public function install() {
 
-		global $wpdb;
+        global $wpdb;
 
-		$wpdb->query(
-			"
+        $wpdb->query(
+            "
 			UPDATE {$wpdb->prefix}wl_entities
 			SET about_jsonld = NULL
 			WHERE about_jsonld = '' OR about_jsonld = 'null'
 		"
-		);
+        );
 
-		Ttl_Cache::flush_all();
-	}
+        Ttl_Cache::flush_all();
+    }
 }

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

Indentation +185 added lines, -185 removed lines

@@ -18,192 +18,192 @@
  */
 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';
-		// 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';
+        // 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(),
-		);
-		self::$instance = $this;
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		add_action( 'init', array( $this, 'install' ) );
-
-	}
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @since 3.18.0
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Loop thought all versions and install the updates.
-	 *
-	 * @return void
-	 * @since 3.18.0
-	 *
-	 * @since 3.20.0 use a transient to avoid concurrent installation calls.
-	 */
-	public function install() {
-
-		$version = null;
-
-		if ( $this->install_required() && false === get_transient( '_wl_installing' ) ) {
-			set_transient( '_wl_installing', true, 5 * MINUTE_IN_SECONDS );
-			/** @var Wordlift_Install $install */
-			foreach ( $this->installs as $install ) {
-				// Get the install version.
-				$version = $install->get_version();
-
-				if ( version_compare( $version, $this->get_current_version(), '>' )
-					 || $install->must_install() ) {
-					$class_name = get_class( $install );
-
-					$this->log->info( "Current version is {$this->get_current_version()}, installing $class_name..." );
-					// Install version.
-					$install->install();
-
-					$this->log->info( "$class_name installed." );
-
-					// Bump the version.
-					update_option( 'wl_db_version', $version );
-				}
-			}
-
-			// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
-			@delete_transient( '_wl_installing' );
-
-		}
-
-	}
-
-	private function install_required() {
-
-		/** @var Wordlift_Install $install */
-		foreach ( $this->installs as $install ) {
-			// Get the install version.
-			$version = $install->get_version();
-
-			if ( version_compare( $version, $this->get_current_version(), '>' )
-				 || $install->must_install() ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Retrieve the current db version.
-	 *
-	 * @return type
-	 */
-	private function get_current_version() {
-		return get_option( 'wl_db_version', '0.0.0' );
-	}
+            new Wordlift_Install_Package_Type(),
+            new Wordlift_Install_3_23_4(),
+            new Wordlift_Install_3_24_2(),
+            new Wordlift_Install_3_25_0(),
+            new Wordlift_Install_3_27_0(),
+            new Wordlift_Install_3_27_1(),
+            new Wordlift_Install_3_28_0(),
+            // Add column to represent term
+            new Wordlift_Install_3_32_0(),
+            // Add the entities table.
+            new Wordlift_Install_3_33_9(),
+            // When woocommerce extension installed, acf4so should be installed automatically.
+            new Wordlift_Install_3_36_0(),
+
+            new Wordlift_Install_3_38_5(),
+            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(),
+        );
+        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' );
+    }
 
 }

src/modules/dashboard/load.php

Indentation +54 added lines, -54 removed lines

@@ -21,67 +21,67 @@ 
  */
 function __wl_dashboard__load() {
 
-	// Dashboard is available only for Food Kg and Gardening Kg atm
-	// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-	if ( ! apply_filters( 'wl_feature__enable__food-kg', false ) && ! apply_filters( 'wl_feature__enable__gardening-kg', false ) ) {
-		return;
-	}
+    // Dashboard is available only for Food Kg and Gardening Kg atm
+    // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+    if ( ! apply_filters( 'wl_feature__enable__food-kg', false ) && ! apply_filters( 'wl_feature__enable__gardening-kg', false ) ) {
+        return;
+    }
 
-	// Autoloader for plugin itself.
-	if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
-		require_once __DIR__ . '/vendor/autoload.php';
-	}
+    // Autoloader for plugin itself.
+    if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
+        require_once __DIR__ . '/vendor/autoload.php';
+    }
 
-	$container_builder = new ContainerBuilder();
-	$loader            = new YamlFileLoader( $container_builder, new FileLocator( __DIR__ ) );
-	$loader->load( 'services.yml' );
-	$container_builder->compile();
+    $container_builder = new ContainerBuilder();
+    $loader            = new YamlFileLoader( $container_builder, new FileLocator( __DIR__ ) );
+    $loader->load( 'services.yml' );
+    $container_builder->compile();
 
-	/**
-	 * @var $rest_controller Rest_Controller
-	 */
-	$rest_controller = $container_builder->get( 'Wordlift\Modules\Dashboard\Synchronization\Rest_Controller' );
-	$rest_controller->register_hooks();
+    /**
+     * @var $rest_controller Rest_Controller
+     */
+    $rest_controller = $container_builder->get( 'Wordlift\Modules\Dashboard\Synchronization\Rest_Controller' );
+    $rest_controller->register_hooks();
 
-	/**
-	 * @var $term_entity_match_rest_controller Term_Entity_Match_Rest_Controller
-	 */
-	$term_entity_match_rest_controller = $container_builder->get( Term_Entity_Match_Rest_Controller::class );
-	$term_entity_match_rest_controller->register_hooks();
+    /**
+     * @var $term_entity_match_rest_controller Term_Entity_Match_Rest_Controller
+     */
+    $term_entity_match_rest_controller = $container_builder->get( Term_Entity_Match_Rest_Controller::class );
+    $term_entity_match_rest_controller->register_hooks();
 
-	/**
-	 * @var $term_entity_match_rest_controller \Wordlift\Modules\Dashboard\Post_Entity_Match\Post_Entity_Match_Rest_Controller
-	 */
-	$post_entity_match_rest_controller = $container_builder->get( \Wordlift\Modules\Dashboard\Post_Entity_Match\Post_Entity_Match_Rest_Controller::class );
-	$post_entity_match_rest_controller->register_hooks();
+    /**
+     * @var $term_entity_match_rest_controller \Wordlift\Modules\Dashboard\Post_Entity_Match\Post_Entity_Match_Rest_Controller
+     */
+    $post_entity_match_rest_controller = $container_builder->get( \Wordlift\Modules\Dashboard\Post_Entity_Match\Post_Entity_Match_Rest_Controller::class );
+    $post_entity_match_rest_controller->register_hooks();
 
-	/**
-	 * @var $synchronization_service Synchronization_Service
-	 */
-	$synchronization_service = $container_builder->get( 'Wordlift\Modules\Dashboard\Synchronization\Synchronization_Service' );
-	$synchronization_service->register_hooks();
+    /**
+     * @var $synchronization_service Synchronization_Service
+     */
+    $synchronization_service = $container_builder->get( 'Wordlift\Modules\Dashboard\Synchronization\Synchronization_Service' );
+    $synchronization_service->register_hooks();
 
-	$app_settings = $container_builder->get( App_Settings::class );
-	$app_settings->register_hooks();
+    $app_settings = $container_builder->get( App_Settings::class );
+    $app_settings->register_hooks();
 
-	/** Admin Menu */
-	add_action(
-		'admin_menu',
-		function () {
-			add_submenu_page( 'wl_admin_menu', __( 'Dashboard', 'wordlift' ), __( 'Dashboard', 'wordlift' ), 'manage_options', 'wl_admin_menu', '_wl_dashboard__main' );
-		},
-		9
-	);
+    /** Admin Menu */
+    add_action(
+        'admin_menu',
+        function () {
+            add_submenu_page( 'wl_admin_menu', __( 'Dashboard', 'wordlift' ), __( 'Dashboard', 'wordlift' ), 'manage_options', 'wl_admin_menu', '_wl_dashboard__main' );
+        },
+        9
+    );
 
-	add_action(
-		'_wl_dashboard__main',
-		function () {
-			// why not wp_enqueue_script ? because the iframe will start loading and it won't find the
-			// settings in parent window if it's not printed before.
-			wp_print_scripts( WL_ANGULAR_APP_SCRIPT_HANDLE );
-			$iframe_src = WL_ANGULAR_APP_URL . '#/admin/dashboard';
-			// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			echo "
+    add_action(
+        '_wl_dashboard__main',
+        function () {
+            // why not wp_enqueue_script ? because the iframe will start loading and it won't find the
+            // settings in parent window if it's not printed before.
+            wp_print_scripts( WL_ANGULAR_APP_SCRIPT_HANDLE );
+            $iframe_src = WL_ANGULAR_APP_URL . '#/admin/dashboard';
+            // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+            echo "
 			<style>
 			    #wlx-plugin-app {
 			      margin-left: -20px;
@@ -92,8 +92,8 @@ 
 			<iframe id='wlx-plugin-app' src='$iframe_src'></iframe>
             ";
 
-		}
-	);
+        }
+    );
 
 }
 

src/modules/dashboard/includes/Match/Match_Query_Builder.php

Indentation +99 added lines, -99 removed lines

@@ -5,104 +5,104 @@
 use Wordlift\Assertions;
 
 abstract class Match_Query_Builder {
-	/**
-	 * @var array
-	 */
-	protected $params;
-	/**
-	 * @var Match_Sort
-	 */
-	protected $sort;
-
-	protected $sql = '';
-
-	/**
-	 * @param $params array
-	 * @param $sort Match_Sort
-	 *
-	 * @throws \Exception Throws Exception if the parameters arent of right type.
-	 */
-	public function __construct( $params, $sort ) {
-
-		Assertions::is_array( $params );
-		Assertions::is_a( $sort, Match_Sort::class );
-
-		$this->params = $params;
-		$this->sort   = $sort;
-	}
-
-	/**
-	 * This method should build the query from params and sort object,
-	 * then return the prepared query.
-	 *
-	 * @return string
-	 */
-	public function get() {
-		$this->build();
-
-		return $this->sql;
-	}
-
-	/**
-	 * @return void
-	 */
-	abstract protected function build();
-
-	/**
-	 * Apply the sort for the cursor.
-	 *
-	 * @return Match_Query_Builder
-	 */
-	protected function cursor() {
-		global $wpdb;
-		$tmp_sql             = " AND {$this->sort->get_field_name()} ";
-		$is_included         = ( $this->params['element'] !== 'EXCLUDED' );
-		$is_ascending        = ( $this->params['direction'] !== 'DESCENDING' );
-		$is_sorted_ascending = $this->sort->is_ascending();
-		switch ( array( $is_ascending, $is_sorted_ascending ) ) {
-			case array( true, true ):   // Forward & Ascending Order
-			case array( false, false ): // Backward & Descending Order
-				$tmp_sql .= ' >';
-				break;
-			case array( true, false ):  // Forward & Ascending Order
-			case array( false, true ):  // Backward & Descending Order
-				$tmp_sql .= ' <';
-				break;
-		}
-		if ( $is_included ) {
-			$tmp_sql .= '=';
-		}
-		$tmp_sql .= ' %s';
-
-		// `$tmp_sql` is built dynamically in this function
-		// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
-		$this->sql .= $wpdb->prepare( $tmp_sql, $this->params['position'] );
-		return $this;
-	}
-
-	protected function has_match() {
-		$value = $this->params['has_match'];
-
-		if ( true === $value ) {
-			$this->sql .= ' AND e.about_jsonld IS NOT NULL ';
-		} elseif ( false === $value ) {
-			$this->sql .= ' AND e.about_jsonld IS NULL ';
-		}
-
-		return $this;
-	}
-
-	protected function limit() {
-		$limit = $this->params['limit'];
-		global $wpdb;
-		$this->sql .= $wpdb->prepare( ' LIMIT %d', $limit );
-		return $this;
-	}
-
-	protected function order_by() {
-		$direction  = $this->params['direction'];
-		$this->sql .= $this->sort->get_orderby_clause( $direction );
-		return $this;
-	}
+    /**
+     * @var array
+     */
+    protected $params;
+    /**
+     * @var Match_Sort
+     */
+    protected $sort;
+
+    protected $sql = '';
+
+    /**
+     * @param $params array
+     * @param $sort Match_Sort
+     *
+     * @throws \Exception Throws Exception if the parameters arent of right type.
+     */
+    public function __construct( $params, $sort ) {
+
+        Assertions::is_array( $params );
+        Assertions::is_a( $sort, Match_Sort::class );
+
+        $this->params = $params;
+        $this->sort   = $sort;
+    }
+
+    /**
+     * This method should build the query from params and sort object,
+     * then return the prepared query.
+     *
+     * @return string
+     */
+    public function get() {
+        $this->build();
+
+        return $this->sql;
+    }
+
+    /**
+     * @return void
+     */
+    abstract protected function build();
+
+    /**
+     * Apply the sort for the cursor.
+     *
+     * @return Match_Query_Builder
+     */
+    protected function cursor() {
+        global $wpdb;
+        $tmp_sql             = " AND {$this->sort->get_field_name()} ";
+        $is_included         = ( $this->params['element'] !== 'EXCLUDED' );
+        $is_ascending        = ( $this->params['direction'] !== 'DESCENDING' );
+        $is_sorted_ascending = $this->sort->is_ascending();
+        switch ( array( $is_ascending, $is_sorted_ascending ) ) {
+            case array( true, true ):   // Forward & Ascending Order
+            case array( false, false ): // Backward & Descending Order
+                $tmp_sql .= ' >';
+                break;
+            case array( true, false ):  // Forward & Ascending Order
+            case array( false, true ):  // Backward & Descending Order
+                $tmp_sql .= ' <';
+                break;
+        }
+        if ( $is_included ) {
+            $tmp_sql .= '=';
+        }
+        $tmp_sql .= ' %s';
+
+        // `$tmp_sql` is built dynamically in this function
+        // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+        $this->sql .= $wpdb->prepare( $tmp_sql, $this->params['position'] );
+        return $this;
+    }
+
+    protected function has_match() {
+        $value = $this->params['has_match'];
+
+        if ( true === $value ) {
+            $this->sql .= ' AND e.about_jsonld IS NOT NULL ';
+        } elseif ( false === $value ) {
+            $this->sql .= ' AND e.about_jsonld IS NULL ';
+        }
+
+        return $this;
+    }
+
+    protected function limit() {
+        $limit = $this->params['limit'];
+        global $wpdb;
+        $this->sql .= $wpdb->prepare( ' LIMIT %d', $limit );
+        return $this;
+    }
+
+    protected function order_by() {
+        $direction  = $this->params['direction'];
+        $this->sql .= $this->sort->get_orderby_clause( $direction );
+        return $this;
+    }
 
 }

src/modules/dashboard/includes/Match/Match_Service.php

Indentation +74 added lines, -74 removed lines

@@ -6,93 +6,93 @@
 
 abstract class Match_Service {
 
-	/**
-	 * @param $content_id
-	 * @param $content_type
-	 * @param $match_id
-	 * @param $jsonld
-	 *
-	 * @return Match_Entry
-	 * @throws \Exception Throw Exception if the jsonld cant be set.
-	 */
-	public function set_jsonld( $content_id, $content_type, $match_id, $jsonld ) {
+    /**
+     * @param $content_id
+     * @param $content_type
+     * @param $match_id
+     * @param $jsonld
+     *
+     * @return Match_Entry
+     * @throws \Exception Throw Exception if the jsonld cant be set.
+     */
+    public function set_jsonld( $content_id, $content_type, $match_id, $jsonld ) {
 
-		global $wpdb;
+        global $wpdb;
 
-		/**
-		 * 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 === $jsonld ) {
-			$wpdb->query(
-				$wpdb->prepare(
-					"UPDATE {$wpdb->prefix}wl_entities SET about_jsonld = NULL WHERE id = %d AND content_id = %d AND content_type = %d",
-					$match_id,
-					$content_id,
-					$content_type
-				)
-			);
-		} else {
-			$wpdb->query(
-				$wpdb->prepare(
-					"UPDATE {$wpdb->prefix}wl_entities SET about_jsonld = %s WHERE id = %d AND content_id = %d AND content_type = %d",
-					wp_json_encode( $jsonld ),
-					$match_id,
-					$content_id,
-					$content_type
-				)
-			);
-		}
+        /**
+         * 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 === $jsonld ) {
+            $wpdb->query(
+                $wpdb->prepare(
+                    "UPDATE {$wpdb->prefix}wl_entities SET about_jsonld = NULL WHERE id = %d AND content_id = %d AND content_type = %d",
+                    $match_id,
+                    $content_id,
+                    $content_type
+                )
+            );
+        } else {
+            $wpdb->query(
+                $wpdb->prepare(
+                    "UPDATE {$wpdb->prefix}wl_entities SET about_jsonld = %s WHERE id = %d AND content_id = %d AND content_type = %d",
+                    wp_json_encode( $jsonld ),
+                    $match_id,
+                    $content_id,
+                    $content_type
+                )
+            );
+        }
 
-		if ( Object_Type_Enum::TERM === $content_type ) {
+        if ( Object_Type_Enum::TERM === $content_type ) {
 
-			$query = "SELECT e.content_id as match_id, e.about_jsonld as match_jsonld,  t.name,  e.id FROM {$wpdb->prefix}wl_entities e
+            $query = "SELECT e.content_id as match_id, e.about_jsonld as match_jsonld,  t.name,  e.id FROM {$wpdb->prefix}wl_entities e
                   LEFT JOIN {$wpdb->prefix}terms t ON e.content_id = t.term_id
                   WHERE  e.id = %d AND e.content_id = %d AND e.content_type = %d";
-			// `{$wpdb->prefix}` cant be escaped for preparing.
-			// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
-			$results = $wpdb->get_row( $wpdb->prepare( $query, $match_id, $content_id, $content_type ), ARRAY_A );
-			return Match_Entry::from( $results );
-		}
+            // `{$wpdb->prefix}` cant be escaped for preparing.
+            // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+            $results = $wpdb->get_row( $wpdb->prepare( $query, $match_id, $content_id, $content_type ), ARRAY_A );
+            return Match_Entry::from( $results );
+        }
 
-		if ( Object_Type_Enum::POST === $content_type ) {
+        if ( Object_Type_Enum::POST === $content_type ) {
 
-			$query = "SELECT e.content_id as match_id, e.about_jsonld as match_jsonld,  p.post_title AS name,  e.id FROM {$wpdb->prefix}wl_entities e
+            $query = "SELECT e.content_id as match_id, e.about_jsonld as match_jsonld,  p.post_title AS name,  e.id FROM {$wpdb->prefix}wl_entities e
                   LEFT JOIN {$wpdb->prefix}posts p ON e.content_id = p.ID
                   WHERE  e.id = %d AND e.content_id = %d AND e.content_type = %d";
-			// `{$wpdb->prefix}` cant be escaped for preparing.
-			// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
-			$results = $wpdb->get_row( $wpdb->prepare( $query, $match_id, $content_id, $content_type ), ARRAY_A );
+            // `{$wpdb->prefix}` cant be escaped for preparing.
+            // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+            $results = $wpdb->get_row( $wpdb->prepare( $query, $match_id, $content_id, $content_type ), ARRAY_A );
 
-			return Match_Entry::from( $results );
-		}
+            return Match_Entry::from( $results );
+        }
 
-	}
+    }
 
-	/**
-	 * @param $content_id int
-	 * @param $content_type int
-	 * @throws \Exception Throw Exception if the entry is not found.
-	 * @return int
-	 */
-	public function get_id( $content_id, $content_type ) {
-		global $wpdb;
-		$result = $wpdb->get_var(
-			// `{$wpdb->prefix}` cant be escaped for preparing.
-			// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
-			$wpdb->prepare(
-				"SELECT id FROM {$wpdb->prefix}wl_entities WHERE content_id = %d AND content_type = %d",
-				$content_id,
-				$content_type
-			)
-		);
-		if ( null === $result ) {
-			throw new \Exception( "Unable to find match id for {$content_id} and {$content_type}" );
-		}
+    /**
+     * @param $content_id int
+     * @param $content_type int
+     * @throws \Exception Throw Exception if the entry is not found.
+     * @return int
+     */
+    public function get_id( $content_id, $content_type ) {
+        global $wpdb;
+        $result = $wpdb->get_var(
+            // `{$wpdb->prefix}` cant be escaped for preparing.
+            // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+            $wpdb->prepare(
+                "SELECT id FROM {$wpdb->prefix}wl_entities WHERE content_id = %d AND content_type = %d",
+                $content_id,
+                $content_type
+            )
+        );
+        if ( null === $result ) {
+            throw new \Exception( "Unable to find match id for {$content_id} and {$content_type}" );
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 
 }

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

Indentation +93 added lines, -93 removed lines

@@ -10,121 +10,121 @@
 // 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
-	 */
-	public function set_about_jsonld( $content_id, $value ) {
-		global $wpdb;
-
-		// Cleanup value.
-		$value = ( is_string( $value ) && strlen( $value ) > 2 ) ? $value : null;
-
-		// 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(
-					"
+                $content_id->get_id(),
+                $content_id->get_type()
+            )
+        );
+    }
+
+    /**
+     * @param Wordpress_Content_Id $content_id
+     * @param string               $value
+     */
+    public function set_about_jsonld( $content_id, $value ) {
+        global $wpdb;
+
+        // Cleanup value.
+        $value = ( is_string( $value ) && strlen( $value ) > 2 ) ? $value : null;
+
+        // 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
 			WHERE content_id = %d AND content_type = %d
 			",
-					$content_id->get_id(),
-					$content_id->get_type()
-				)
-			);
-		}
-
-		return $wpdb->query(
-			$wpdb->prepare(
-				"
+                    $content_id->get_id(),
+                    $content_id->get_type()
+                )
+            );
+        }
+
+        return $wpdb->query(
+            $wpdb->prepare(
+                "
 			UPDATE {$wpdb->prefix}wl_entities
 			SET about_jsonld = %s
 			WHERE content_id = %d AND content_type = %d
 			",
-				$value,
-				$content_id->get_id(),
-				$content_id->get_type()
-			)
-		);
-	}
+                $value,
+                $content_id->get_id(),
+                $content_id->get_type()
+            )
+        );
+    }
 
 }