Updated WPDBTable

Author: varunsridharan

composer.lock

@@ -1,28 +1,20 @@
 <?php
-/**
- * A base WordPress database table class with query builder
- *
- * @author Varun Sridharan <varunsridharan23@gmail.com>
- * @version 1.0
- * @since 1.0
- * @link
- * @copyright 2018 Varun Sridharan
- * @license GPLV3 Or Greater (https://www.gnu.org/licenses/gpl-3.0.txt)
- */
+
 
 namespace Varunsridharan\WordPress;
 
 if ( ! defined( 'ABSPATH' ) ) {
 	die;
 }
 
+use TheLeague\Database\Query_Builder;
+
 if ( ! class_exists( '\Varunsridharan\WordPress\DB_Table' ) ) {
 	/**
 	 * Class DB_Table
 	 *
 	 * @package Varunsridharan\WordPress
 	 * @author Varun Sridharan <varunsridharan23@gmail.com>
-	 * @since 1.0
 	 *
 	 * A base WordPress database table class, which facilitates the creation of
 	 * and schema changes to individual database tables.
@@ -38,7 +30,7 @@
 	 * - Tables upgrade via independent upgrade abstract methods
 	 * - Multisite friendly - site tables switch on "switch_blog" action
 	 */
-	abstract class DB_Table extends \TheLeague\Database\Query_Builder {
+	abstract class DB_Table extends Query_Builder {
 
 		/**
 		 * Table name, without the global table prefix
@@ -141,7 +133,7 @@ public function __construct() {
 		/**
 		 * Returns Current Instance / create a new instance
 		 *
-		 * @return self
+		 * @return self|static
 		 */
 		public static function instance() {
 			if ( ! isset( self::$_instances[ static::class ] ) ) {
@@ -152,15 +144,11 @@ public static function instance() {
 
 		/**
 		 * Setup this database table
-		 *
-		 * @since 1.1.0
 		 */
 		protected abstract function set_schema();
 
 		/**
 		 * Upgrade this database table
-		 *
-		 * @since 1.1.0
 		 */
 		protected abstract function upgrade();
 
@@ -183,8 +171,6 @@ protected abstract function table_version();
 		 *
 		 * Hooked to the "switch_blog" action.
 		 *
-		 * @since 1.1.0
-		 *
 		 * @param int $site_id The site being switched to
 		 */
 		public function switch_blog( $site_id = 0 ) {
@@ -198,35 +184,31 @@ public function switch_blog( $site_id = 0 ) {
 		 * Maybe upgrade the database table. Handles creation & schema changes.
 		 *
 		 * Hooked to the "admin_init" action.
-		 *
-		 * @since 1.1.0
 		 */
 		public function maybe_upgrade() {
 			if ( ! $this->exists() ) {
 				$this->create();
-			}
+			} else {
+				$needs_upgrade = version_compare( $this->version, $this->db_version, '>=' );
 
-			$needs_upgrade = version_compare( (int) $this->db_version, (int) $this->version, '>=' );
+				if ( true === $needs_upgrade ) {
+					return;
+				}
 
-			if ( true === $needs_upgrade ) {
-				return;
-			}
+				if ( $this->is_global() && ! \wp_should_upgrade_global_tables() ) {
+					return;
+				}
 
-			if ( $this->is_global() && ! \wp_should_upgrade_global_tables() ) {
-				return;
+				$this->exists() ? $this->upgrade() : $this->create();
 			}
 
-			$this->exists() ? $this->upgrade() : $this->create();
-
 			if ( $this->exists() ) {
 				$this->set_db_version();
 			}
 		}
 
 		/**
 		 * Setup the necessary table variables
-		 *
-		 * @since 1.1.0
 		 */
 		private function setup() {
 			$this->db = isset( $GLOBALS['wpdb'] ) ? $GLOBALS['wpdb'] : false;
@@ -252,8 +234,6 @@ private function setup() {
 		 *
 		 * This must be done directly because WordPress does not have a mechanism
 		 * for manipulating them safely
-		 *
-		 * @since 1.1.0
 		 */
 		private function set_wpdb_tables() {
 			if ( $this->is_global() ) {
@@ -281,38 +261,30 @@ private function set_wpdb_tables() {
 		 * Set the database version for the table
 		 *
 		 * Global table version in "_sitemeta" on the main network
-		 *
-		 * @since 1.1.0
 		 */
 		private function set_db_version() {
-			$this->db_version = $this->version;
+			$this->version = $this->db_version;
 			$this->is_global() ? \update_network_option( null, $this->db_version_key, $this->version ) : \update_option( $this->db_version_key, $this->version );
 		}
 
 		/**
 		 * Get the table version from the database
 		 *
 		 * Global table version from "_sitemeta" on the main network
-		 *
-		 * @since 1.1.0
 		 */
 		private function get_db_version() {
-			$this->db_version = $this->is_global() ? \get_network_option( null, $this->db_version_key, false ) : \get_option( $this->db_version_key, false );
+			$this->version = $this->is_global() ? \get_network_option( null, $this->db_version_key, false ) : \get_option( $this->db_version_key, false );
 		}
 
 		/**
 		 * Add class hooks to WordPress actions
-		 *
-		 * @since 1.1.0
 		 */
 		private function add_hooks() {
 			\add_action( 'switch_blog', array( $this, 'switch_blog' ) );
 		}
 
 		/**
 		 * Create the table
-		 *
-		 * @since 1.1.0
 		 */
 		private function create() {
 			if ( ! function_exists( 'dbDelta' ) ) {
@@ -340,8 +312,6 @@ protected function after_table_created() {
 		/**
 		 * Check if table already exists
 		 *
-		 * @since 1.1.0
-		 *
 		 * @return bool
 		 */
 		private function exists() {
@@ -355,8 +325,6 @@ private function exists() {
 		/**
 		 * Check if table is global
 		 *
-		 * @since 1.2.0
-		 *
 		 * @return bool
 		 */
 		private function is_global() {
@@ -373,8 +341,6 @@ private function is_global() {
 		 * - No double underscores
 		 * - No trailing underscores
 		 *
-		 * @since 1.3.0
-		 *
 		 * @param string $name The name of the database table
 		 *
 		 * @return string Sanitized database table name