Fix changing template and better use of singletons

inc/admin-pages/class-list-admin-page.php

@@ -17,6 +17,8 @@
 // Exit if accessed directly
 defined('ABSPATH') || exit;
 
+use WP_List_Table;
+
 /**
  * Abstract class that makes it easy to create new admin pages.
  */

inc/class-dashboard-statistics.php

@@ -23,9 +23,7 @@
  *
  * @since 2.0.0
  */
-class Dashboard_Statistics implements \WP_Ultimo\Interfaces\Singleton {
-
-	use \WP_Ultimo\Traits\Singleton;
+class Dashboard_Statistics {
 
 	/**
 	 * The initial date of the statistics.
@@ -49,12 +47,11 @@ class Dashboard_Statistics implements \WP_Ultimo\Interfaces\Singleton {
 	protected $types = [];
 
 	/**
-	 * Loads the hooks we need for dismissing notices
+	 * Constructor.
 	 *
 	 * @since 2.0.0
 	 *
 	 * @param array $args With the start_date, end_date and the data type functions.
-	 * @return void.
 	 */
 	public function __construct($args = []) {
 
@@ -67,14 +64,6 @@ public function __construct($args = []) {
 		}
 	}
 
-	/**
-	 * Runs on singleton instantiation.
-	 *
-	 * @since 2.0.0
-	 * @return void.
-	 */
-	public function init(): void {}
-
 	/**
 	 * Main function to call the get data functions based on the array of types.
 	 *

inc/class-user-switching.php

@@ -24,9 +24,12 @@
 	use \WP_Ultimo\Traits\Singleton;
 
 	/**
-	 * Constructor for the User_Switching.
+	 * Initialize the singleton.
+	 *
+	 * @since 2.0.0
+	 * @return void
 	 */
-	public function __construct() {
+	public function init(): void {
 
 		add_action('plugins_loaded', [$this, 'register_forms']);
 	}
@@ -122,7 +125,7 @@
 		if ( ! $this->check_user_switching_is_activated()) {
 			return wu_get_form_url('install_user_switching');
 		} else {
 			$link = \user_switching::switch_to_url($user);
 
 			return $link;
 		}

inc/class-wp-ultimo.php

@@ -568,11 +568,6 @@ function () {
 			}
 		);
 
-		/*
-		 * Dashboard Statistics
-		 */
-		\WP_Ultimo\Dashboard_Statistics::get_instance();
-
 		/*
 		 * Network Plugins/Themes usage columns
 		 */

inc/ui/class-jumper.php

@@ -40,11 +40,12 @@ class Jumper {
 	protected $transient_key = 'wu-jumper-menu-list';
 
 	/**
-	 * Element construct.
+	 * Initialize the singleton.
 	 *
 	 * @since 2.0.0
+	 * @return void
 	 */
-	public function __construct() {
+	public function init(): void {
 
 		add_action('init', [$this, 'add_settings'], 20);
 

inc/ui/class-template-switching-element.php

@@ -263,7 +263,7 @@ public function setup_preview(): void {
 	 *
 	 * @since 2.0.4
 	 *
-	 * @return json|\WP_Error Switch template response.
+	 * @return void
 	 */
 	public function switch_template() {
 
@@ -274,7 +274,8 @@ public function switch_template() {
 		$template_id = wu_request('template_id', '');
 
 		if ( ! $template_id) {
-			return new \WP_Error('template_id_required', __('You need to provide a valid template to duplicate.', 'ultimate-multisite'));
+			wp_send_json_error(new \WP_Error('template_id_required', __('You need to provide a valid template to duplicate.', 'ultimate-multisite')));
+			return;
 		}
 
 		$switch = \WP_Ultimo\Helpers\Site_Duplicator::override_site($template_id, $this->site->get_id());
@@ -283,7 +284,7 @@ public function switch_template() {
 		 * Allow plugin developers to hook functions after a user or super admin switches the site template
 		 *
 		 * @since 1.9.8
-		 * @param integer Site ID
+		 * @param int $id Site ID
 		 * @return void
 		 */
 		do_action('wu_after_switch_template', $this->site->get_id());
@@ -319,7 +320,7 @@ public function switch_template() {
 	public function output($atts, $content = null): void {
 
 		if ($this->site) {
-			$filter_template_limits = new \WP_Ultimo\Limits\Site_Template_Limits();
+			$filter_template_limits = \WP_Ultimo\Limits\Site_Template_Limits::get_instance();
 
 			$atts['products'] = $this->products;
 

inc/ui/class-toolbox.php

@@ -22,11 +22,12 @@ class Toolbox {
 	use \WP_Ultimo\Traits\Singleton;
 
 	/**
-	 * Element construct.
+	 * Initialize the singleton.
 	 *
 	 * @since 2.0.0
+	 * @return void
 	 */
-	public function __construct() {
+	public function init(): void {
 
 		add_action('init', [$this, 'load_toolbox']);
 	}

inc/ui/class-tours.php

@@ -30,11 +30,12 @@ class Tours {
 	protected $tours = [];
 
 	/**
-	 * Element construct.
+	 * Initialize the singleton.
 	 *
 	 * @since 2.0.0
+	 * @return void
 	 */
-	public function __construct() {
+	public function init(): void {
 
 		add_action('wp_ajax_wu_mark_tour_as_finished', [$this, 'mark_as_finished']);