insideout10 / wordlift-plugin

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

Indentation +194 added lines, -194 removed lines

@@ -18,204 +18,204 @@
  */
 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-49-2.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-52-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-49-2.php';
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-52-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_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_49_2(),
-
-			new Wordlift_Install_3_52_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;
-			}
-		}
+            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_49_2(),
+
+            new Wordlift_Install_3_52_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;
-	}
+        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 +49 added lines, -49 removed lines

@@ -49,39 +49,39 @@ 
 	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-49-2.php';
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-3-52-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-49-2.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-3-52-1.php';
 
 		// Get the install services.
 		$this->installs = array(
@@ -136,9 +136,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'));
 
 	}
 
@@ -164,30 +164,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');
 
 		}
 
@@ -196,12 +196,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;
 			}
 		}
@@ -215,7 +215,7 @@ 
 	 * @return type
 	 */
 	private function get_current_version() {
-		return get_option( 'wl_db_version', '0.0.0' );
+		return get_option('wl_db_version', '0.0.0');
 	}
 
 }

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

Indentation +8 added lines, -8 removed lines

@@ -7,14 +7,14 @@
  */
 class Wordlift_Install_3_52_1 extends Wordlift_Install {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	protected static $version = '3.52.1';
+    /**
+     * {@inheritdoc}
+     */
+    protected static $version = '3.52.1';
 
-	public function install() {
-		// Since we're fixing JSON-LDs better flush them all.
-		Ttl_Cache::flush_all();
-	}
+    public function install() {
+        // Since we're fixing JSON-LDs better flush them all.
+        Ttl_Cache::flush_all();
+    }
 
 }

src/classes/jsonld/class-jsonld-article-wrapper.php

Indentation +198 added lines, -198 removed lines

@@ -7,203 +7,203 @@
 
 class Jsonld_Article_Wrapper {
 
-	public static $article_types = array(
-		'Article',
-		'AdvertiserContentArticle',
-		'NewsArticle',
-		'AnalysisNewsArticle',
-		'AskPublicNewsArticle',
-		'BackgroundNewsArticle',
-		'OpinionNewsArticle',
-		'ReportageNewsArticle',
-		'ReviewNewsArticle',
-		'Report',
-		'SatiricalArticle',
-		'ScholarlyArticle',
-		'MedicalScholarlyArticle',
-		'SocialMediaPosting',
-		'BlogPosting',
-		'LiveBlogPosting',
-		'DiscussionForumPosting',
-		'TechArticle',
-		'APIReference',
-	);
-
-	/**
-	 * @var Wordlift_Post_To_Jsonld_Converter
-	 */
-	private $post_to_jsonld_converter;
-	/**
-	 * @var \Wordlift_Cached_Post_Converter
-	 */
-	private $cached_postid_to_jsonld_converter;
-	/**
-	 * @var \Wordlift_Entity_Uri_Service
-	 */
-	private $entity_uri_service;
-
-	/**
-	 * Jsonld_Article_Wrapper constructor.
-	 *
-	 * @param Wordlift_Post_To_Jsonld_Converter $post_to_jsonld_converter
-	 * @param $cached_postid_to_jsonld_converter
-	 */
-	public function __construct( $post_to_jsonld_converter, $cached_postid_to_jsonld_converter ) {
-
-		$this->post_to_jsonld_converter = $post_to_jsonld_converter->new_instance_with_filters_disabled();
-
-		add_filter(
-			'wl_after_get_jsonld',
-			array(
-				$this,
-				'after_get_jsonld',
-			),
-			PHP_INT_MAX - 100,
-			3
-		);
-
-		$this->cached_postid_to_jsonld_converter = $cached_postid_to_jsonld_converter;
-
-		$this->entity_uri_service = \Wordlift_Entity_Uri_Service::get_instance();
-	}
-
-	public function after_get_jsonld( $jsonld, $post_id, $context ) {
-
-		// Invalid data structure
-		if ( ! is_array( $jsonld ) || ! isset( $jsonld[0] ) || ! is_array( $jsonld[0] ) ) {
-			return $jsonld;
-		}
-
-		if ( Jsonld_Context_Enum::PAGE !== $context
-			 // Returns true for "1", "true", "on" and "yes". Returns false otherwise.
-			 && ! filter_input( INPUT_GET, 'article_wrapper', FILTER_VALIDATE_BOOLEAN ) ) {
-			return $jsonld;
-		}
-
-		// Copy the 1st array element
-		$post_jsonld = $jsonld[0];
-
-		// Don't wrap in article if the json-ld is already about an Article (or its descendants). `@type` must be
-		// in the schema.org context, i.e. `Article`, not `http://schema.org/Article`.
-		if ( ! isset( $post_jsonld['@id'] ) || ! isset( $post_jsonld['@type'] ) || $this->is_article( $post_jsonld['@type'] ) ) {
-			return $jsonld;
-		}
-
-		$references      = array();
-		$reference_infos = array();
-
-		// Convert the post as Article.
-		$article_jsonld = $this->post_to_jsonld_converter->convert( $post_id, $references, $reference_infos, new Relations() );
-
-		$article_jsonld['@id'] = $post_jsonld['@id'] . '#article';
-		// Reset the type, since by default the type assigned via the Entity Type taxonomy is used.
-		$article_jsonld['@type'] = 'Article';
-		$article_jsonld['about'] = array( '@id' => $post_jsonld['@id'] );
-
-		// Copy over the URLs.
-		if ( isset( $post_jsonld['url'] ) ) {
-			$article_jsonld['url'] = $post_jsonld['url'];
-		}
-
-		array_unshift( $jsonld, $article_jsonld );
-
-		// Only add authors if the key is present.
-		if ( isset( $article_jsonld['author'] ) ) {
-			$this->add_author_data_if_missing( $jsonld, $article_jsonld['author'] );
-		}
-
-		return $jsonld;
-	}
-
-	/**
-	 * @param array            $jsonld
-	 * @param array|false|null $author Either a keyed or an indexed array.
-	 *
-	 * @return void
-	 */
-	private function add_author_data_if_missing( &$jsonld, $author ) {
-
-		// For each author when if the `@id` is present and if not, add the author data.
-		$entities_ids = $this->get_list_of_entities_ids( $author );
-		foreach ( $entities_ids as $entity_id ) {
-			if ( $this->is_author_entity_present_in_graph( $jsonld, $entity_id ) ) {
-				continue;
-			}
-
-			$author_data = $this->get_author_data_by_entity_id( $entity_id );
-
-			if ( ! is_array( $author_data ) || empty( $author_data ) ) {
-				continue;
-			}
-			$jsonld[] = $author_data;
-		}
-
-	}
-
-	/**
-	 * This function takes any input parameter and when it's an array, it'll return the @id properties in this array as
-	 * an array of `@id`s.
-	 *
-	 * @param mixed $items Preferably an array, either keyed or indexed.
-	 *
-	 * @return array An array of `@id`s. Empty if not found.
-	 */
-	private function get_list_of_entities_ids( $items ) {
-		// If this is not an array, then what are we doing here? we return an empty array.
-		if ( ! is_array( $items ) || empty( $items ) ) {
-			return array();
-		}
-
-		// If this is a keyed array and the `@id` is set, then we return that single `@id`.
-		if ( isset( $items['@id'] ) ) {
-			return array( $items['@id'] );
-		}
-
-		// Poor way to check whether this is an indexed array.
-		if ( ! isset( $items[0] ) ) {
-			return array();
-		}
-
-		// If this is an indexed array then we return the `@id` for all the items in the array.
-		return array_filter( array_column( $items, '@id' ) );
-	}
-
-	private function is_article( $schema_types ) {
-
-		$array_intersect = array_intersect( self::$article_types, (array) $schema_types );
-
-		return ! empty( $array_intersect );
-	}
-
-	private function get_author_data_by_entity_id( $author_linked_entity_id ) {
-
-		$author_entity_post = $this->entity_uri_service->get_entity( $author_linked_entity_id );
-
-		if ( ! $author_entity_post instanceof \WP_Post ) {
-			return false;
-		}
-
-		$references      = array();
-		$reference_infos = array();
-
-		return $this->cached_postid_to_jsonld_converter->convert(
-			$author_entity_post->ID,
-			$references,
-			$reference_infos,
-			new Relations()
-		);
-
-	}
-
-	private function is_author_entity_present_in_graph( $jsonld, $author_entity_id ) {
-
-		foreach ( $jsonld as $item ) {
-			if ( $item && array_key_exists( '@id', $item ) && $item['@id'] === $author_entity_id ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
+    public static $article_types = array(
+        'Article',
+        'AdvertiserContentArticle',
+        'NewsArticle',
+        'AnalysisNewsArticle',
+        'AskPublicNewsArticle',
+        'BackgroundNewsArticle',
+        'OpinionNewsArticle',
+        'ReportageNewsArticle',
+        'ReviewNewsArticle',
+        'Report',
+        'SatiricalArticle',
+        'ScholarlyArticle',
+        'MedicalScholarlyArticle',
+        'SocialMediaPosting',
+        'BlogPosting',
+        'LiveBlogPosting',
+        'DiscussionForumPosting',
+        'TechArticle',
+        'APIReference',
+    );
+
+    /**
+     * @var Wordlift_Post_To_Jsonld_Converter
+     */
+    private $post_to_jsonld_converter;
+    /**
+     * @var \Wordlift_Cached_Post_Converter
+     */
+    private $cached_postid_to_jsonld_converter;
+    /**
+     * @var \Wordlift_Entity_Uri_Service
+     */
+    private $entity_uri_service;
+
+    /**
+     * Jsonld_Article_Wrapper constructor.
+     *
+     * @param Wordlift_Post_To_Jsonld_Converter $post_to_jsonld_converter
+     * @param $cached_postid_to_jsonld_converter
+     */
+    public function __construct( $post_to_jsonld_converter, $cached_postid_to_jsonld_converter ) {
+
+        $this->post_to_jsonld_converter = $post_to_jsonld_converter->new_instance_with_filters_disabled();
+
+        add_filter(
+            'wl_after_get_jsonld',
+            array(
+                $this,
+                'after_get_jsonld',
+            ),
+            PHP_INT_MAX - 100,
+            3
+        );
+
+        $this->cached_postid_to_jsonld_converter = $cached_postid_to_jsonld_converter;
+
+        $this->entity_uri_service = \Wordlift_Entity_Uri_Service::get_instance();
+    }
+
+    public function after_get_jsonld( $jsonld, $post_id, $context ) {
+
+        // Invalid data structure
+        if ( ! is_array( $jsonld ) || ! isset( $jsonld[0] ) || ! is_array( $jsonld[0] ) ) {
+            return $jsonld;
+        }
+
+        if ( Jsonld_Context_Enum::PAGE !== $context
+                // Returns true for "1", "true", "on" and "yes". Returns false otherwise.
+             && ! filter_input( INPUT_GET, 'article_wrapper', FILTER_VALIDATE_BOOLEAN ) ) {
+            return $jsonld;
+        }
+
+        // Copy the 1st array element
+        $post_jsonld = $jsonld[0];
+
+        // Don't wrap in article if the json-ld is already about an Article (or its descendants). `@type` must be
+        // in the schema.org context, i.e. `Article`, not `http://schema.org/Article`.
+        if ( ! isset( $post_jsonld['@id'] ) || ! isset( $post_jsonld['@type'] ) || $this->is_article( $post_jsonld['@type'] ) ) {
+            return $jsonld;
+        }
+
+        $references      = array();
+        $reference_infos = array();
+
+        // Convert the post as Article.
+        $article_jsonld = $this->post_to_jsonld_converter->convert( $post_id, $references, $reference_infos, new Relations() );
+
+        $article_jsonld['@id'] = $post_jsonld['@id'] . '#article';
+        // Reset the type, since by default the type assigned via the Entity Type taxonomy is used.
+        $article_jsonld['@type'] = 'Article';
+        $article_jsonld['about'] = array( '@id' => $post_jsonld['@id'] );
+
+        // Copy over the URLs.
+        if ( isset( $post_jsonld['url'] ) ) {
+            $article_jsonld['url'] = $post_jsonld['url'];
+        }
+
+        array_unshift( $jsonld, $article_jsonld );
+
+        // Only add authors if the key is present.
+        if ( isset( $article_jsonld['author'] ) ) {
+            $this->add_author_data_if_missing( $jsonld, $article_jsonld['author'] );
+        }
+
+        return $jsonld;
+    }
+
+    /**
+     * @param array            $jsonld
+     * @param array|false|null $author Either a keyed or an indexed array.
+     *
+     * @return void
+     */
+    private function add_author_data_if_missing( &$jsonld, $author ) {
+
+        // For each author when if the `@id` is present and if not, add the author data.
+        $entities_ids = $this->get_list_of_entities_ids( $author );
+        foreach ( $entities_ids as $entity_id ) {
+            if ( $this->is_author_entity_present_in_graph( $jsonld, $entity_id ) ) {
+                continue;
+            }
+
+            $author_data = $this->get_author_data_by_entity_id( $entity_id );
+
+            if ( ! is_array( $author_data ) || empty( $author_data ) ) {
+                continue;
+            }
+            $jsonld[] = $author_data;
+        }
+
+    }
+
+    /**
+     * This function takes any input parameter and when it's an array, it'll return the @id properties in this array as
+     * an array of `@id`s.
+     *
+     * @param mixed $items Preferably an array, either keyed or indexed.
+     *
+     * @return array An array of `@id`s. Empty if not found.
+     */
+    private function get_list_of_entities_ids( $items ) {
+        // If this is not an array, then what are we doing here? we return an empty array.
+        if ( ! is_array( $items ) || empty( $items ) ) {
+            return array();
+        }
+
+        // If this is a keyed array and the `@id` is set, then we return that single `@id`.
+        if ( isset( $items['@id'] ) ) {
+            return array( $items['@id'] );
+        }
+
+        // Poor way to check whether this is an indexed array.
+        if ( ! isset( $items[0] ) ) {
+            return array();
+        }
+
+        // If this is an indexed array then we return the `@id` for all the items in the array.
+        return array_filter( array_column( $items, '@id' ) );
+    }
+
+    private function is_article( $schema_types ) {
+
+        $array_intersect = array_intersect( self::$article_types, (array) $schema_types );
+
+        return ! empty( $array_intersect );
+    }
+
+    private function get_author_data_by_entity_id( $author_linked_entity_id ) {
+
+        $author_entity_post = $this->entity_uri_service->get_entity( $author_linked_entity_id );
+
+        if ( ! $author_entity_post instanceof \WP_Post ) {
+            return false;
+        }
+
+        $references      = array();
+        $reference_infos = array();
+
+        return $this->cached_postid_to_jsonld_converter->convert(
+            $author_entity_post->ID,
+            $references,
+            $reference_infos,
+            new Relations()
+        );
+
+    }
+
+    private function is_author_entity_present_in_graph( $jsonld, $author_entity_id ) {
+
+        foreach ( $jsonld as $item ) {
+            if ( $item && array_key_exists( '@id', $item ) && $item['@id'] === $author_entity_id ) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 
 }

Spacing +34 added lines, -34 removed lines

@@ -48,7 +48,7 @@ 
 	 * @param Wordlift_Post_To_Jsonld_Converter $post_to_jsonld_converter
 	 * @param $cached_postid_to_jsonld_converter
 	 */
-	public function __construct( $post_to_jsonld_converter, $cached_postid_to_jsonld_converter ) {
+	public function __construct($post_to_jsonld_converter, $cached_postid_to_jsonld_converter) {
 
 		$this->post_to_jsonld_converter = $post_to_jsonld_converter->new_instance_with_filters_disabled();
 
@@ -67,16 +67,16 @@ 
 		$this->entity_uri_service = \Wordlift_Entity_Uri_Service::get_instance();
 	}
 
-	public function after_get_jsonld( $jsonld, $post_id, $context ) {
+	public function after_get_jsonld($jsonld, $post_id, $context) {
 
 		// Invalid data structure
-		if ( ! is_array( $jsonld ) || ! isset( $jsonld[0] ) || ! is_array( $jsonld[0] ) ) {
+		if ( ! is_array($jsonld) || ! isset($jsonld[0]) || ! is_array($jsonld[0])) {
 			return $jsonld;
 		}
 
-		if ( Jsonld_Context_Enum::PAGE !== $context
+		if (Jsonld_Context_Enum::PAGE !== $context
 			 // Returns true for "1", "true", "on" and "yes". Returns false otherwise.
-			 && ! filter_input( INPUT_GET, 'article_wrapper', FILTER_VALIDATE_BOOLEAN ) ) {
+			 && ! filter_input(INPUT_GET, 'article_wrapper', FILTER_VALIDATE_BOOLEAN)) {
 			return $jsonld;
 		}
 
@@ -85,7 +85,7 @@ 
 
 		// Don't wrap in article if the json-ld is already about an Article (or its descendants). `@type` must be
 		// in the schema.org context, i.e. `Article`, not `http://schema.org/Article`.
-		if ( ! isset( $post_jsonld['@id'] ) || ! isset( $post_jsonld['@type'] ) || $this->is_article( $post_jsonld['@type'] ) ) {
+		if ( ! isset($post_jsonld['@id']) || ! isset($post_jsonld['@type']) || $this->is_article($post_jsonld['@type'])) {
 			return $jsonld;
 		}
 
@@ -93,23 +93,23 @@ 
 		$reference_infos = array();
 
 		// Convert the post as Article.
-		$article_jsonld = $this->post_to_jsonld_converter->convert( $post_id, $references, $reference_infos, new Relations() );
+		$article_jsonld = $this->post_to_jsonld_converter->convert($post_id, $references, $reference_infos, new Relations());
 
-		$article_jsonld['@id'] = $post_jsonld['@id'] . '#article';
+		$article_jsonld['@id'] = $post_jsonld['@id'].'#article';
 		// Reset the type, since by default the type assigned via the Entity Type taxonomy is used.
 		$article_jsonld['@type'] = 'Article';
-		$article_jsonld['about'] = array( '@id' => $post_jsonld['@id'] );
+		$article_jsonld['about'] = array('@id' => $post_jsonld['@id']);
 
 		// Copy over the URLs.
-		if ( isset( $post_jsonld['url'] ) ) {
+		if (isset($post_jsonld['url'])) {
 			$article_jsonld['url'] = $post_jsonld['url'];
 		}
 
-		array_unshift( $jsonld, $article_jsonld );
+		array_unshift($jsonld, $article_jsonld);
 
 		// Only add authors if the key is present.
-		if ( isset( $article_jsonld['author'] ) ) {
-			$this->add_author_data_if_missing( $jsonld, $article_jsonld['author'] );
+		if (isset($article_jsonld['author'])) {
+			$this->add_author_data_if_missing($jsonld, $article_jsonld['author']);
 		}
 
 		return $jsonld;
@@ -121,18 +121,18 @@ 
 	 *
 	 * @return void
 	 */
-	private function add_author_data_if_missing( &$jsonld, $author ) {
+	private function add_author_data_if_missing(&$jsonld, $author) {
 
 		// For each author when if the `@id` is present and if not, add the author data.
-		$entities_ids = $this->get_list_of_entities_ids( $author );
-		foreach ( $entities_ids as $entity_id ) {
-			if ( $this->is_author_entity_present_in_graph( $jsonld, $entity_id ) ) {
+		$entities_ids = $this->get_list_of_entities_ids($author);
+		foreach ($entities_ids as $entity_id) {
+			if ($this->is_author_entity_present_in_graph($jsonld, $entity_id)) {
 				continue;
 			}
 
-			$author_data = $this->get_author_data_by_entity_id( $entity_id );
+			$author_data = $this->get_author_data_by_entity_id($entity_id);
 
-			if ( ! is_array( $author_data ) || empty( $author_data ) ) {
+			if ( ! is_array($author_data) || empty($author_data)) {
 				continue;
 			}
 			$jsonld[] = $author_data;
@@ -148,38 +148,38 @@ 
 	 *
 	 * @return array An array of `@id`s. Empty if not found.
 	 */
-	private function get_list_of_entities_ids( $items ) {
+	private function get_list_of_entities_ids($items) {
 		// If this is not an array, then what are we doing here? we return an empty array.
-		if ( ! is_array( $items ) || empty( $items ) ) {
+		if ( ! is_array($items) || empty($items)) {
 			return array();
 		}
 
 		// If this is a keyed array and the `@id` is set, then we return that single `@id`.
-		if ( isset( $items['@id'] ) ) {
-			return array( $items['@id'] );
+		if (isset($items['@id'])) {
+			return array($items['@id']);
 		}
 
 		// Poor way to check whether this is an indexed array.
-		if ( ! isset( $items[0] ) ) {
+		if ( ! isset($items[0])) {
 			return array();
 		}
 
 		// If this is an indexed array then we return the `@id` for all the items in the array.
-		return array_filter( array_column( $items, '@id' ) );
+		return array_filter(array_column($items, '@id'));
 	}
 
-	private function is_article( $schema_types ) {
+	private function is_article($schema_types) {
 
-		$array_intersect = array_intersect( self::$article_types, (array) $schema_types );
+		$array_intersect = array_intersect(self::$article_types, (array) $schema_types);
 
-		return ! empty( $array_intersect );
+		return ! empty($array_intersect);
 	}
 
-	private function get_author_data_by_entity_id( $author_linked_entity_id ) {
+	private function get_author_data_by_entity_id($author_linked_entity_id) {
 
-		$author_entity_post = $this->entity_uri_service->get_entity( $author_linked_entity_id );
+		$author_entity_post = $this->entity_uri_service->get_entity($author_linked_entity_id);
 
-		if ( ! $author_entity_post instanceof \WP_Post ) {
+		if ( ! $author_entity_post instanceof \WP_Post) {
 			return false;
 		}
 
@@ -195,10 +195,10 @@ 
 
 	}
 
-	private function is_author_entity_present_in_graph( $jsonld, $author_entity_id ) {
+	private function is_author_entity_present_in_graph($jsonld, $author_entity_id) {
 
-		foreach ( $jsonld as $item ) {
-			if ( $item && array_key_exists( '@id', $item ) && $item['@id'] === $author_entity_id ) {
+		foreach ($jsonld as $item) {
+			if ($item && array_key_exists('@id', $item) && $item['@id'] === $author_entity_id) {
 				return true;
 			}
 		}