Use jetpack autoloader and composer instead of namespace rewrite

inc/admin-pages/class-checkout-form-edit-admin-page.php

@@ -1118,7 +1118,7 @@ class Checkout_Form_Edit_Admin_Page extends Edit_Admin_Page {
 	 */
 	public function get_required_list($field_slug, $field_types): array {
 
-		$fields = \WP_Ultimo\Dependencies\Arrch\Arrch::find($field_types, array(
+		$fields = \Arrch\Arrch::find($field_types, array(
 			'sort_key' => 'order',
 			'where'    => array(
 				array('default_fields', '~', $field_slug),

inc/checkout/class-cart.php

@@ -11,7 +11,7 @@ namespace WP_Ultimo\Checkout;
 
 use \WP_Ultimo\Checkout\Line_Item;
 use \WP_Ultimo\Database\Memberships\Membership_Status;
-use \WP_Ultimo\Dependencies\Arrch\Arrch as Array_Search;
+use \Arrch\Arrch as Array_Search;
 
 // Exit if accessed directly
 defined('ABSPATH') || exit;

inc/checkout/class-checkout.php

@@ -12,7 +12,7 @@ namespace WP_Ultimo\Checkout;
 // Exit if accessed directly
 defined('ABSPATH') || exit;
 
-use \WP_Ultimo\Dependencies\Psr\Log\LogLevel;
+use \Psr\Log\LogLevel;
 use \WP_Ultimo\Database\Sites\Site_Type;
 use \WP_Ultimo\Database\Payments\Payment_Status;
 use \WP_Ultimo\Database\Memberships\Membership_Status;

inc/class-ajax.php

@@ -345,7 +345,7 @@ class Ajax {
 
 		} // end foreach;
 
-		$_settings = \WP_Ultimo\Dependencies\Arrch\Arrch::find($all_fields, array(
+		$_settings = \Arrch\Arrch::find($all_fields, array(
 			'sort_key' => 'title',
 			'where'    => array(
 				array('setting_id', '~', trim((string) $query['search'], '*')),

inc/class-async-calls.php

@@ -9,14 +9,14 @@
 
 namespace WP_Ultimo;
 
-use \WP_Ultimo\Dependencies\Amp\Iterator;
-use \WP_Ultimo\Dependencies\Amp\Sync\LocalSemaphore;
-use \WP_Ultimo\Dependencies\Amp\Sync\ConcurrentIterator;
-use \WP_Ultimo\Dependencies\Amp\Http\Client\Request;
-use \WP_Ultimo\Dependencies\Amp\Http\Client\Connection\DefaultConnectionPool;
-use \WP_Ultimo\Dependencies\Amp\Socket\ClientTlsContext;
-use \WP_Ultimo\Dependencies\Amp\Socket\ConnectContext;
-use \WP_Ultimo\Dependencies\Amp\Http\Client\HttpClientBuilder;
+use \Amp\Iterator;
+use \Amp\Sync\LocalSemaphore;
+use \Amp\Sync\ConcurrentIterator;
+use \Amp\Http\Client\Request;
+use \Amp\Http\Client\Connection\DefaultConnectionPool;
+use \Amp\Socket\ClientTlsContext;
+use \Amp\Socket\ConnectContext;
+use \Amp\Http\Client\HttpClientBuilder;
 
 // Exit if accessed directly
 defined('ABSPATH') || exit;
@@ -137,7 +137,7 @@ class Async_Calls {
 	 * Builds and returns the client that will handle the calls.
 	 *
 	 * @since 2.0.7
-	 * @return \WP_Ultimo\Dependencies\Amp\Http\Client\HttpClient;
+	 * @return \Amp\Http\Client\HttpClient;
 	 */
 	public static function get_client() {
 
@@ -173,7 +173,7 @@ class Async_Calls {
 
 		$urls = self::build_url_list($id, $total, $chunk_size, $args);
 
-		$coroutine = \WP_Ultimo\Dependencies\Amp\call(static function() use ($id, $total, $chunk_size, $parallel_threads, $client, $urls) {
+		$coroutine = \Amp\call(static function() use ($id, $total, $chunk_size, $parallel_threads, $client, $urls) {
 
 			$results = array();
 
@@ -211,7 +211,7 @@ class Async_Calls {
 
 		});
 
-		$responses = \WP_Ultimo\Dependencies\Amp\Promise\wait($coroutine);
+		$responses = \Amp\Promise\wait($coroutine);
 
 		return $responses;
 

inc/class-autoloader.php

@@ -9,7 +9,7 @@
 
 namespace WP_Ultimo;
 
-use WP_Ultimo\Dependencies\Pablo_Pacheco\WP_Namespace_Autoloader\WP_Namespace_Autoloader;
+use Pablo_Pacheco\WP_Namespace_Autoloader\WP_Namespace_Autoloader;
 
 // Exit if accessed directly
 defined('ABSPATH') || exit;

inc/class-dashboard-widgets.php

@@ -215,7 +215,7 @@ class Dashboard_Widgets {
 			),
 		);
 
-		$done = \WP_Ultimo\Dependencies\Arrch\Arrch::find($steps, array(
+		$done = \Arrch\Arrch::find($steps, array(
 			'where' => array(
 				array('done', true),
 			),

inc/class-logger.php

@@ -14,8 +14,8 @@ namespace WP_Ultimo;
 // Exit if accessed directly
 defined('ABSPATH') || exit;
 
-use WP_Ultimo\Dependencies\Psr\Log\AbstractLogger;
-use WP_Ultimo\Dependencies\Psr\Log\LogLevel;
+use Psr\Log\AbstractLogger;
+use Psr\Log\LogLevel;
 
 /**
  * WP Multisite WaaS Logger

inc/class-session-cookie.php

@@ -12,7 +12,7 @@
 namespace WP_Ultimo;
 
 use \WP_Ultimo\Contracts\Session;
-use \WP_Ultimo\Dependencies\Delight\Cookie\Cookie;
+use \Delight\Cookie\Cookie;
 
 // Exit if accessed directly
 defined('ABSPATH') || exit;

inc/class-sunrise.php

@@ -9,7 +9,7 @@
 
 namespace WP_Ultimo;
 
-use WP_Ultimo\Dependencies\Psr\Log\LogLevel;
+use Psr\Log\LogLevel;
 
 // Exit if accessed directly
 defined('ABSPATH') || exit;

inc/database/engine/class-base.php

@@ -17,7 +17,7 @@ defined('ABSPATH') || exit;
  *
  * @since 1.0.0
  */
-class Base extends \WP_Ultimo\Dependencies\BerlinDB\Database\Base {
+class Base extends \BerlinDB\Database\Base {
 
 	protected $prefix = 'wu';
 

inc/database/engine/class-column.php

@@ -17,7 +17,7 @@ defined('ABSPATH') || exit;
  *
  * @since 1.0.0
  */
-class Column extends \WP_Ultimo\Dependencies\BerlinDB\Database\Column {
+class Column extends \BerlinDB\Database\Column {
 
 	protected $prefix = 'wu';
 

inc/database/engine/class-compare.php

@@ -17,4 +17,4 @@ defined('ABSPATH') || exit;
  *
  * @since 1.0.0
  */
-class Compare extends \WP_Ultimo\Dependencies\BerlinDB\Database\Compare {} // end class Compare;
+class Compare extends \BerlinDB\Database\Compare {} // end class Compare;

inc/database/engine/class-date.php

@@ -17,4 +17,4 @@ defined('ABSPATH') || exit;
  *
  * @since 1.0.0
  */
-class Date extends \WP_Ultimo\Dependencies\BerlinDB\Database\Date {} // end class Date;
+class Date extends \BerlinDB\Database\Date {} // end class Date;

inc/database/engine/class-meta.php

@@ -17,4 +17,4 @@ defined('ABSPATH') || exit;
  *
  * @since 1.0.0
  */
-class Meta extends \WP_Ultimo\Dependencies\BerlinDB\Database\Meta {} // end class Meta;
+class Meta extends \BerlinDB\Database\Meta {} // end class Meta;

inc/database/engine/class-query.php

@@ -17,7 +17,7 @@ defined('ABSPATH') || exit;
  *
  * @since 1.0.0
  */
-class Query extends \WP_Ultimo\Dependencies\BerlinDB\Database\Query {
+class Query extends \BerlinDB\Database\Query {
 
  	/**
 	 * The prefix for the custom table.

inc/database/engine/class-row.php

@@ -17,7 +17,7 @@ defined('ABSPATH') || exit;
  *
  * @since 1.0.0
  */
-class Row extends \WP_Ultimo\Dependencies\BerlinDB\Database\Row {
+class Row extends \BerlinDB\Database\Row {
 
 	protected $prefix = 'wu';
 

inc/database/engine/class-schema.php

@@ -17,7 +17,7 @@ defined('ABSPATH') || exit;
  *
  * @since 1.0.0
  */
-class Schema extends \WP_Ultimo\Dependencies\BerlinDB\Database\Schema {
+class Schema extends \BerlinDB\Database\Schema {
 
 	protected $prefix = 'wu';
 

inc/database/engine/class-table.php

@@ -17,7 +17,7 @@ defined('ABSPATH') || exit;
  *
  * @since 1.0.0
  */
-abstract class Table extends \WP_Ultimo\Dependencies\BerlinDB\Database\Table {
+abstract class Table extends \BerlinDB\Database\Table {
 
 	/**
 	 * Table prefix.

inc/deprecated/deprecated.php

@@ -655,7 +655,7 @@ class WU_Util {
 	 * @deprecated 2.0.0
 	 *
 	 * @param string $hex Hex code of the color.
-	 * @return \WP_Ultimo\Dependencies\Mexitek\PHPColors\Color
+	 * @return \Mexitek\PHPColors\Color
 	 */
 	public static function color($hex) {
 

inc/domain-mapping/class-helper.php

@@ -9,8 +9,8 @@
 
 namespace WP_Ultimo\Domain_Mapping;
 
-use WP_Ultimo\Dependencies\Spatie\SslCertificate\SslCertificate;
-use WP_Ultimo\Dependencies\Psr\Log\LogLevel;
+use Spatie\SslCertificate\SslCertificate;
+use Psr\Log\LogLevel;
 
 // Exit if accessed directly
 defined('ABSPATH') || exit;

inc/duplication/data.php

@@ -1,6 +1,6 @@
 <?php
 
-use \WP_Ultimo\Dependencies\Psr\Log\LogLevel;
+use \Psr\Log\LogLevel;
 
 if( !class_exists( 'MUCD_Data' ) ) {
 

inc/functions/color.php

@@ -14,7 +14,7 @@
 // Exit if accessed directly
 defined('ABSPATH') || exit;
 
-use \WP_Ultimo\Dependencies\Mexitek\PHPColors\Color;
+use \Mexitek\PHPColors\Color;
 
 /**
  * Returns a Color object.
@@ -22,7 +22,7 @@ use \WP_Ultimo\Dependencies\Mexitek\PHPColors\Color;
  * @since 2.0.0
  *
  * @param string $hex Hex code for the color. E.g. #000.
- * @return \WP_Ultimo\Dependencies\Mexitek\PHPColors\Color
+ * @return \Mexitek\PHPColors\Color
  */
 function wu_color($hex) {
 

inc/functions/date.php

@@ -55,7 +55,7 @@ function wu_validate_date($date, $format = 'Y-m-d H:i:s') {
  * @see https://carbon.nesbot.com/docs/
  *
  * @param string|false $date Parsable date string.
- * @return \WP_Ultimo\Dependencies\Carbon\Carbon
+ * @return \Carbon\Carbon
  */
 function wu_date($date = false) {
 
@@ -65,7 +65,7 @@ function wu_date($date = false) {
 
 	} // end if;
 
-	return \WP_Ultimo\Dependencies\Carbon\Carbon::parse($date);
+	return \Carbon\Carbon::parse($date);
 
 } // end wu_date;
 

inc/functions/helper.php

@@ -10,7 +10,7 @@
 defined('ABSPATH') || exit;
 
 use \WP_Ultimo\Exception\Runtime_Exception;
-use \WP_Ultimo\Dependencies\Psr\Log\LogLevel;
+use \Psr\Log\LogLevel;
 
 /**
  * Returns the WP Multisite WaaS version.

inc/functions/reflection.php

@@ -9,7 +9,7 @@
 // Exit if accessed directly
 defined('ABSPATH') || exit;
 
-use \WP_Ultimo\Dependencies\phpDocumentor\Reflection\DocBlockFactory;
+use \phpDocumentor\Reflection\DocBlockFactory;
 
 /**
  * Creates the REST API schema blueprint for an object based on setters.

inc/gateways/class-base-stripe-gateway.php

@@ -11,10 +11,10 @@
 
 namespace WP_Ultimo\Gateways;
 
-use \WP_Ultimo\Dependencies\Psr\Log\LogLevel;
+use \Psr\Log\LogLevel;
 use \WP_Ultimo\Gateways\Base_Gateway;
 use \WP_Ultimo\Gateways\Ignorable_Exception;
-use \WP_Ultimo\Dependencies\Stripe;
+use \Stripe;
 use \WP_Ultimo\Models\Membership;
 use \WP_Ultimo\Database\Payments\Payment_Status;
 use \WP_Ultimo\Checkout\Cart;
@@ -913,7 +913,7 @@ class Base_Stripe_Gateway extends Base_Gateway {
   * @param integer $customer_id WP Multisite WaaS customer ID.
   * @param integer $user_id The WordPress user ID.
   * @param integer $stripe_customer_id The Stripe Customer ID.
-  * @return \WP_Ultimo\Dependencies\Stripe\Customer|\WP_Error
+  * @return \Stripe\Customer|\WP_Error
   */
  public function get_or_create_customer($customer_id = 0, $user_id = 0, $stripe_customer_id = 0) {
 		/*

inc/gateways/class-stripe-checkout-gateway.php

@@ -12,7 +12,7 @@
 namespace WP_Ultimo\Gateways;
 
 use \WP_Ultimo\Gateways\Base_Stripe_Gateway;
-use \WP_Ultimo\Dependencies\Stripe;
+use \Stripe;
 use \WP_Ultimo\Checkout\Cart;
 
 // Exit if accessed directly

inc/gateways/class-stripe-gateway.php

@@ -14,7 +14,7 @@ namespace WP_Ultimo\Gateways;
 use \WP_Ultimo\Database\Payments\Payment_Status;
 use \WP_Ultimo\Database\Memberships\Membership_Status;
 use \WP_Ultimo\Gateways\Base_Stripe_Gateway;
-use \WP_Ultimo\Dependencies\Stripe;
+use \Stripe;
 
 // Exit if accessed directly
 defined('ABSPATH') || exit;

inc/helpers/class-hash.php

@@ -9,7 +9,7 @@
 
 namespace WP_Ultimo\Helpers;
 
-use WP_Ultimo\Dependencies\Hashids\Hashids;
+use Hashids\Hashids;
 
 // Exit if accessed directly
 defined('ABSPATH') || exit;

inc/helpers/class-screenshot.php

@@ -9,7 +9,7 @@
 
 namespace WP_Ultimo\Helpers;
 
-use WP_Ultimo\Dependencies\Psr\Log\LogLevel;
+use Psr\Log\LogLevel;
 
 // Exit if accessed directly
 defined('ABSPATH') || exit;

inc/helpers/class-site-duplicator.php

@@ -9,7 +9,7 @@
 
 namespace WP_Ultimo\Helpers;
 
-use WP_Ultimo\Dependencies\Psr\Log\LogLevel;
+use Psr\Log\LogLevel;
 
 // Exit if accessed directly
 defined('ABSPATH') || exit;

inc/helpers/class-validator.php

@@ -9,7 +9,7 @@
 
 namespace WP_Ultimo\Helpers;
 
-use \WP_Ultimo\Dependencies\Rakit\Validation\Validator as Validator_Helper;
+use \Rakit\Validation\Validator as Validator_Helper;
 use \WP_Ultimo\Helpers\Validation_Rules\Unique;
 use \WP_Ultimo\Helpers\Validation_Rules\Unique_Site;
 use \WP_Ultimo\Helpers\Validation_Rules\Exists;

inc/helpers/validation-rules/class-checkout-steps.php

@@ -9,7 +9,7 @@
 
 namespace WP_Ultimo\Helpers\Validation_Rules;
 
-use WP_Ultimo\Dependencies\Rakit\Validation\Rule;
+use Rakit\Validation\Rule;
 use WP_Ultimo\Managers\Signup_Fields_Manager;
 
 // Exit if accessed directly
@@ -112,7 +112,7 @@ class Checkout_Steps extends Rule {
      */
     foreach ($value as $step) {
 
-      $found_submittable_field_types = \WP_Ultimo\Dependencies\Arrch\Arrch::find($step['fields'], array(
+      $found_submittable_field_types = \Arrch\Arrch::find($step['fields'], array(
         'where'    => array(
           array('type', $submittable_field_types),
         ),

inc/helpers/validation-rules/class-city.php

@@ -12,7 +12,7 @@ namespace WP_Ultimo\Helpers\Validation_Rules;
 // Exit if accessed directly
 defined('ABSPATH') || exit;
 
-use WP_Ultimo\Dependencies\Rakit\Validation\Rule;
+use Rakit\Validation\Rule;
 
 /**
  * Validates template sites.

inc/helpers/validation-rules/class-country.php

@@ -12,7 +12,7 @@ namespace WP_Ultimo\Helpers\Validation_Rules;
 // Exit if accessed directly
 defined('ABSPATH') || exit;
 
-use WP_Ultimo\Dependencies\Rakit\Validation\Rule;
+use Rakit\Validation\Rule;
 
 /**
  * Validates template sites.

inc/helpers/validation-rules/class-domain.php

@@ -9,7 +9,7 @@
 
 namespace WP_Ultimo\Helpers\Validation_Rules;
 
-use WP_Ultimo\Dependencies\Rakit\Validation\Rule;
+use Rakit\Validation\Rule;
 
 // Exit if accessed directly
 defined('ABSPATH') || exit;

inc/helpers/validation-rules/class-exists.php

@@ -9,7 +9,7 @@
 
 namespace WP_Ultimo\Helpers\Validation_Rules;
 
-use WP_Ultimo\Dependencies\Rakit\Validation\Rule;
+use Rakit\Validation\Rule;
 
 // Exit if accessed directly
 defined('ABSPATH') || exit;

inc/helpers/validation-rules/class-price-variations.php

@@ -9,7 +9,7 @@
 
 namespace WP_Ultimo\Helpers\Validation_Rules;
 
-use WP_Ultimo\Dependencies\Rakit\Validation\Rule;
+use Rakit\Validation\Rule;
 
 // Exit if accessed directly
 defined('ABSPATH') || exit;

inc/helpers/validation-rules/class-products.php

@@ -9,7 +9,7 @@
 
 namespace WP_Ultimo\Helpers\Validation_Rules;
 
-use WP_Ultimo\Dependencies\Rakit\Validation\Rule;
+use Rakit\Validation\Rule;
 
 // Exit if accessed directly
 defined('ABSPATH') || exit;

inc/helpers/validation-rules/class-site-template.php

@@ -9,7 +9,7 @@
 
 namespace WP_Ultimo\Helpers\Validation_Rules;
 
-use \WP_Ultimo\Dependencies\Rakit\Validation\Rule;
+use \Rakit\Validation\Rule;
 use \WP_Ultimo\Checkout\Checkout;
 use \WP_Ultimo\Database\Sites\Site_Type;
 

inc/helpers/validation-rules/class-state.php

@@ -12,7 +12,7 @@ namespace WP_Ultimo\Helpers\Validation_Rules;
 // Exit if accessed directly
 defined('ABSPATH') || exit;
 
-use WP_Ultimo\Dependencies\Rakit\Validation\Rule;
+use Rakit\Validation\Rule;
 
 /**
  * Validates template sites.

inc/helpers/validation-rules/class-unique-site.php

@@ -9,7 +9,7 @@
 
 namespace WP_Ultimo\Helpers\Validation_Rules;
 
-use WP_Ultimo\Dependencies\Rakit\Validation\Rule;
+use Rakit\Validation\Rule;
 
 // Exit if accessed directly
 defined('ABSPATH') || exit;

inc/helpers/validation-rules/class-unique.php

@@ -9,7 +9,7 @@
 
 namespace WP_Ultimo\Helpers\Validation_Rules;
 
-use WP_Ultimo\Dependencies\Rakit\Validation\Rule;
+use Rakit\Validation\Rule;
 
 // Exit if accessed directly
 defined('ABSPATH') || exit;

inc/installers/class-migrator.php

@@ -9,8 +9,8 @@
 
 namespace WP_Ultimo\Installers;
 
-use \WP_Ultimo\Dependencies\Psr\Log\LogLevel;
-use \WP_Ultimo\Dependencies\Ifsnop\Mysqldump\Mysqldump as MySQLDump;
+use \Psr\Log\LogLevel;
+use \Ifsnop\Mysqldump\Mysqldump as MySQLDump;
 use \WP_Ultimo\UI\Template_Previewer;
 use \WP_Ultimo\Models\Checkout_Form;
 use \WP_Ultimo\Checkout\Legacy_Checkout;

inc/integrations/host-providers/class-cloudflare-host-provider.php

@@ -9,7 +9,7 @@
 
 namespace WP_Ultimo\Integrations\Host_Providers;
 
-use WP_Ultimo\Dependencies\Psr\Log\LogLevel;
+use Psr\Log\LogLevel;
 use WP_Ultimo\Integrations\Host_Providers\Base_Host_Provider;
 
 // Exit if accessed directly

inc/integrations/host-providers/class-cloudways-host-provider.php

@@ -9,7 +9,7 @@
 
 namespace WP_Ultimo\Integrations\Host_Providers;
 
-use WP_Ultimo\Dependencies\Psr\Log\LogLevel;
+use Psr\Log\LogLevel;
 use WP_Ultimo\Domain_Mapping\Helper;
 use WP_Ultimo\Integrations\Host_Providers\Base_Host_Provider;
 

inc/integrations/host-providers/class-cpanel-host-provider.php

@@ -9,7 +9,7 @@
 
 namespace WP_Ultimo\Integrations\Host_Providers;
 
-use WP_Ultimo\Dependencies\Psr\Log\LogLevel;
+use Psr\Log\LogLevel;
 use WP_Ultimo\Integrations\Host_Providers\Base_Host_Provider;
 use WP_Ultimo\Integrations\Host_Providers\CPanel_API\CPanel_API;
 

inc/integrations/host-providers/class-runcloud-host-provider.php

@@ -9,7 +9,7 @@
 
 namespace WP_Ultimo\Integrations\Host_Providers;
 
-use WP_Ultimo\Dependencies\Psr\Log\LogLevel;
+use Psr\Log\LogLevel;
 use WP_Ultimo\Integrations\Host_Providers\Base_Host_Provider;
 
 // Exit if accessed directly

inc/integrations/host-providers/class-serverpilot-host-provider.php

@@ -9,7 +9,7 @@
 
 namespace WP_Ultimo\Integrations\Host_Providers;
 
-use WP_Ultimo\Dependencies\Psr\Log\LogLevel;
+use Psr\Log\LogLevel;
 use WP_Ultimo\Integrations\Host_Providers\Base_Host_Provider;
 
 // Exit if accessed directly

inc/integrations/host-providers/class-wpmudev-host-provider.php

@@ -9,7 +9,7 @@
 
 namespace WP_Ultimo\Integrations\Host_Providers;
 
-use WP_Ultimo\Dependencies\Psr\Log\LogLevel;
+use Psr\Log\LogLevel;
 use WP_Ultimo\Integrations\Host_Providers\Base_Host_Provider;
 
 // Exit if accessed directly

inc/invoices/class-invoice.php

@@ -12,8 +12,8 @@ namespace WP_Ultimo\Invoices;
 // Exit if accessed directly
 defined('ABSPATH') || exit;
 
-use \WP_Ultimo\Dependencies\Mpdf\Mpdf;
-use \WP_Ultimo\Dependencies\Mpdf\Output\Destination;
+use \Mpdf\Mpdf;
+use \Mpdf\Output\Destination;
 
 /**
  * Handles the generation of PDF Invoices.

inc/limitations/class-limit-plugins.php

@@ -99,7 +99,7 @@ class Limit_Plugins extends Limit {
 
 		} // end if;
 
-		$results = \WP_Ultimo\Dependencies\Arrch\Arrch::find((array) $this->get_limit(), array(
+		$results = \Arrch\Arrch::find((array) $this->get_limit(), array(
 			'where' => $search_params,
 		));
 

inc/managers/class-domain-manager.php

@@ -607,11 +607,11 @@ class Domain_Manager extends Base_Manager {
 
 		foreach ($record_types as $record_type) {
 
-			$chain = new \WP_Ultimo\Dependencies\RemotelyLiving\PHPDNS\Resolvers\Chain(
-				new \WP_Ultimo\Dependencies\RemotelyLiving\PHPDNS\Resolvers\CloudFlare(),
-				new \WP_Ultimo\Dependencies\RemotelyLiving\PHPDNS\Resolvers\GoogleDNS(),
-				new \WP_Ultimo\Dependencies\RemotelyLiving\PHPDNS\Resolvers\LocalSystem(),
-				new \WP_Ultimo\Dependencies\RemotelyLiving\PHPDNS\Resolvers\Dig(),
+			$chain = new \RemotelyLiving\PHPDNS\Resolvers\Chain(
+				new \RemotelyLiving\PHPDNS\Resolvers\CloudFlare(),
+				new \RemotelyLiving\PHPDNS\Resolvers\GoogleDNS(),
+				new \RemotelyLiving\PHPDNS\Resolvers\LocalSystem(),
+				new \RemotelyLiving\PHPDNS\Resolvers\Dig(),
 			);
 
 			$records = $chain->getRecords($domain, $record_type);

inc/managers/class-email-manager.php

@@ -11,7 +11,7 @@
 
 namespace WP_Ultimo\Managers;
 
-use WP_Ultimo\Dependencies\Psr\Log\LogLevel;
+use Psr\Log\LogLevel;
 use \WP_Ultimo\Managers\Base_Manager;
 use \WP_Ultimo\Models\Email;
 use \WP_Ultimo\Helpers\Sender;

inc/managers/class-gateway-manager.php

@@ -11,7 +11,7 @@
 
 namespace WP_Ultimo\Managers;
 
-use WP_Ultimo\Dependencies\Psr\Log\LogLevel;
+use Psr\Log\LogLevel;
 use \WP_Ultimo\Managers\Base_Manager;
 use \WP_Ultimo\Gateways\Ignorable_Exception;
 

inc/managers/class-limitation-manager.php

@@ -14,7 +14,7 @@ namespace WP_Ultimo\Managers;
 // Exit if accessed directly
 defined('ABSPATH') || exit;
 
-use \WP_Ultimo\Dependencies\Psr\Log\LogLevel;
+use \Psr\Log\LogLevel;
 use \WP_Ultimo\Objects\Limitations;
 use \WP_Ultimo\Database\Sites\Site_Type;
 

inc/managers/class-membership-manager.php

@@ -11,7 +11,7 @@
 
 namespace WP_Ultimo\Managers;
 
-use \WP_Ultimo\Dependencies\Psr\Log\LogLevel;
+use \Psr\Log\LogLevel;
 use \WP_Ultimo\Managers\Base_Manager;
 use \WP_Ultimo\Database\Memberships\Membership_Status;
 

inc/models/class-checkout-form.php

@@ -10,7 +10,7 @@
 namespace WP_Ultimo\Models;
 
 use \WP_Ultimo\Models\Base_Model;
-use \WP_Ultimo\Dependencies\Arrch\Arrch as Array_Search;
+use \Arrch\Arrch as Array_Search;
 
 // Exit if accessed directly
 defined('ABSPATH') || exit;

inc/models/class-site.php

@@ -9,7 +9,7 @@
 
 namespace WP_Ultimo\Models;
 
-use WP_Ultimo\Dependencies\Psr\Log\LogLevel;
+use Psr\Log\LogLevel;
 use \WP_Ultimo\Models\Base_Model;
 use \WP_Ultimo\Objects\Limitations;
 use \WP_Ultimo\Database\Sites\Site_Type;

inc/sso/auth-functions.php

@@ -16,7 +16,7 @@
  * @subpackage SSO
  */
 
-use \WP_Ultimo\Dependencies\Delight\Cookie\Cookie;
+use \Delight\Cookie\Cookie;
 
 // phpcs:disable
 

inc/sso/class-sso-broker.php

@@ -15,7 +15,7 @@ namespace WP_Ultimo\SSO;
 // Exit if accessed directly
 defined('ABSPATH') || exit;
 
-use \WP_Ultimo\Dependencies\Jasny\SSO\Broker\Broker;
+use \Jasny\SSO\Broker\Broker;
 
 /**
  * The SSO Broker implementation.

inc/sso/class-sso-session-handler.php

@@ -14,8 +14,8 @@
 
 namespace WP_Ultimo\SSO;
 
-use \WP_Ultimo\Dependencies\Jasny\SSO\Server\SessionInterface;
-use \WP_Ultimo\Dependencies\Jasny\SSO\ServerException;
+use \Jasny\SSO\Server\SessionInterface;
+use \Jasny\SSO\ServerException;
 use \WP_Ultimo\SSO\Exception\SSO_Session_Exception;
 
 // Exit if accessed directly

inc/sso/class-sso.php

@@ -16,13 +16,13 @@
 namespace WP_Ultimo\SSO;
 
 use \WP_Ultimo\Helpers\Hash;
-use \WP_Ultimo\Dependencies\Jasny\SSO\Server\Server;
-use \WP_Ultimo\Dependencies\Jasny\SSO\Server\ServerException;
-use \WP_Ultimo\Dependencies\Jasny\SSO\Server\BrokerException;
-use \WP_Ultimo\Dependencies\Jasny\SSO\Broker\NotAttachedException;
-use \WP_Ultimo\Dependencies\Nyholm\Psr7\Factory\Psr17Factory;
-use \WP_Ultimo\Dependencies\Symfony\Component\Cache\Adapter\FilesystemAdapter;
-use \WP_Ultimo\Dependencies\Symfony\Component\Cache\Psr16Cache;
+use \Jasny\SSO\Server\Server;
+use \Jasny\SSO\Server\ServerException;
+use \Jasny\SSO\Server\BrokerException;
+use \Jasny\SSO\Broker\NotAttachedException;
+use \Nyholm\Psr7\Factory\Psr17Factory;
+use \Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use \Symfony\Component\Cache\Psr16Cache;
 
 // Exit if accessed directly
 defined('ABSPATH') || exit;
@@ -992,7 +992,7 @@ class SSO {
 	 * Returns a PSR16-compatible cache implementation.
 	 *
 	 * @since 2.0.11
-	 * @return WP_Ultimo\Dependencies\Psr\SimpleCache\CacheInterface
+	 * @return Psr\SimpleCache\CacheInterface
 	 */
 	public function cache() {
 

inc/tax/class-tax.php

@@ -74,7 +74,7 @@ class Tax {
 
 				if (!empty($s)) {
 
-					$filtered = \WP_Ultimo\Dependencies\Arrch\Arrch::find($results, array(
+					$filtered = \Arrch\Arrch::find($results, array(
 						'sort_key' => 'name',
 						'where'    => array(
 							array(array('slug', 'name'), '~', $s),

inc/ui/class-checkout-element.php

@@ -10,7 +10,7 @@
 namespace WP_Ultimo\UI;
 
 use \WP_Ultimo\UI\Base_Element;
-use \WP_Ultimo\Dependencies\ScssPhp\ScssPhp\Compiler;
+use \ScssPhp\ScssPhp\Compiler;
 use \WP_Ultimo\Database\Memberships\Membership_Status;
 
 // Exit if accessed directly

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

@@ -46,7 +46,7 @@ class Template_Switching_Element extends Base_Element {
 	 * The membership object.
 	 *
 	 * @since 2.2.0
-	 * @var \WP_Ultimo\Membership
+	 * @var \WP_Ultimo\Models\Membership
 	 */
 	protected $membership;