revert: undo wu_pre_* filter chokepoints (ADR-001 Amendment 1 supersedure)

inc/models/class-base-model.php

@@ -117,7 +117,7 @@
 	 * @since 2.0.0
 	 * @var Base_Model
 	 */
 	protected $_original;
 
 	/**
 	 * Map setters to other parameters.
@@ -125,7 +125,7 @@
 	 * @since 2.0.0
 	 * @var array
 	 */
 	protected $_mappings = [];
 
 	/**
 	 * Mocked status. Used to suppress errors.
@@ -133,7 +133,7 @@
 	 * @since 2.0.0
 	 * @var boolean
 	 */
 	public $_mocked = false;
 
 	/**
 	 * Constructs the object via the constructor arguments
@@ -300,7 +300,7 @@
 	 */
 	public static function get_schema() {
 
 		$instance = new static();
 
 		$query_class = new $instance->query_class();
 
@@ -338,14 +338,8 @@
 			return false;
 		}
 
 		$instance = new static();
 
-		$pre = apply_filters( "wu_pre_get_by_id_{$instance->model}", null, $item_id );
-
-		if ( null !== $pre ) {
-			return $pre;
-		}
-
 		$query_class = new $instance->query_class();
 
 		return $query_class->get_item($item_id);
@@ -362,14 +356,8 @@
 	 */
 	public static function get_by_hash($item_hash) {
 
 		$instance = new static();
 
-		$pre = apply_filters( "wu_pre_get_by_hash_{$instance->model}", null, $item_hash );
-
-		if ( null !== $pre ) {
-			return $pre;
-		}
-
 		$item_id = Hash::decode($item_hash, sanitize_key((new \ReflectionClass(static::class))->getShortName()));
 
 		$query_class = new $instance->query_class();
@@ -388,14 +376,8 @@
 	 */
 	public static function get_by($column, $value) {
 
 		$instance = new static();
 
-		$pre = apply_filters( "wu_pre_get_by_{$instance->model}", null, $column, $value );
-
-		if ( null !== $pre ) {
-			return $pre;
-		}
-
 		$query_class = new $instance->query_class();
 
 		return $query_class->get_item_by($column, $value);
@@ -411,7 +393,7 @@
 	 */
 	public static function get_items($query) {
 
 		$instance = new static();
 
 		return (new $instance->query_class($query))->query();
 	}
@@ -426,7 +408,7 @@
 	 */
 	public static function get_items_as_array($query = []) {
 
 		$instance = new static();
 
 		$list = (new $instance->query_class($query))->query();
 
@@ -560,7 +542,7 @@
 		 * @param array      $data_unserialized The object data that will be stored.
 		 * @param Base_Model $this The object instance.
 		 */
 		$meta = apply_filters("wu_{$this->model}_meta_pre_save", $meta, $data_unserialized, $this);
 
 		$blocked_attributes = [
 			'query_class',
@@ -596,7 +578,7 @@
 		 * @param array      $data_unserialized The object data that will be stored.
 		 * @param Base_Model $this The object instance.
 		 */
 		$data = apply_filters("wu_{$this->model}_pre_save", $data, $data_unserialized, $this);
 
 		$is_valid_data = $this->validate();
 
@@ -639,7 +621,7 @@
 		 * @param array      $data_unserialized The object data that will be stored.
 		 * @param Base_Model $this The object instance.
 		 */
 		do_action('wu_model_post_save', $this->model, $data, $data_unserialized, $this);
 
 		/**
 		 * Fires after an object is stored into the database.
@@ -650,7 +632,7 @@
 		 * @param Base_Model $this The object instance.
 		 * @param bool       $new  True if the object is new.
 		 */
 		do_action("wu_{$this->model}_post_save", $data, $this, $new);
 
 		return $saved;
 	}
@@ -739,12 +721,12 @@
 
 		if ( ! $this->get_meta_table_name()) {
 
 			// _doing_it_wrong(__METHOD__, __('This model does not support metadata.', 'ultimate-multisite'), '2.0.0');
 
 			return false;
 		}
 
 		// _doing_it_wrong(__METHOD__, __('Model metadata only works for already saved models.', 'ultimate-multisite'), '2.0.0');
 		return ! (! $this->get_id() && ! $this->_mocked);
 	}
 
@@ -1169,7 +1151,7 @@
 	 * @since 2.0.0
 	 * @return array
 	 */
 	public function _get_original() {
 
 		return $this->_original;
 	}

inc/models/class-customer.php

@@ -813,12 +813,6 @@ public function set_type($type) {
 	 */
 	public function get_total_grossed() {
 
-		$pre = apply_filters( 'wu_pre_customer_get_total_grossed', null, $this );
-
-		if ( null !== $pre ) {
-			return $pre;
-		}
-
 		global $wpdb;
 
 		static $sum;

inc/models/class-domain.php

@@ -610,12 +610,6 @@ public function delete() {
 	 */
 	public static function get_by_site($site) {
 
-		$pre = apply_filters( 'wu_pre_domain_get_by_site', null, $site );
-
-		if ( null !== $pre ) {
-			return $pre;
-		}
-
 		global $wpdb;
 
 		// Allow passing a site object in

inc/models/class-membership.php

@@ -2320,12 +2320,6 @@ public function set_recurring($recurring): void {
 	 */
 	public function get_total_grossed() {
 
-		$pre = apply_filters( 'wu_pre_membership_get_total_grossed', null, $this );
-
-		if ( null !== $pre ) {
-			return $pre;
-		}
-
 		global $wpdb;
 
 		static $sum;

inc/models/class-site.php

@@ -1158,12 +1158,6 @@ public function get_membership() {
 			return $this->membership;
 		}
 
-		$pre = apply_filters( 'wu_pre_site_get_membership', null, $this );
-
-		if ( null !== $pre ) {
-			return $pre;
-		}
-
 		global $wpdb;
 
 		$table_name = "{$wpdb->base_prefix}wu_memberships";
@@ -2232,12 +2226,6 @@ public function to_search_results() {
 	 */
 	public static function get_all_by_type($type = 'customer_owned', $query_args = []) {
 
-		$pre = apply_filters( 'wu_pre_site_get_all_by_type', null, $type, $query_args );
-
-		if ( null !== $pre ) {
-			return $pre;
-		}
-
 		global $wpdb;
 
 		if ('pending' === $type) {
@@ -2330,12 +2318,6 @@ public static function get_all_by_categories($categories = [], $query_args = [])
 	 */
 	public static function get_all_categories($sites = []) {
 
-		$pre = apply_filters( 'wu_pre_site_get_all_categories', null, $sites );
-
-		if ( null !== $pre ) {
-			return $pre;
-		}
-
 		global $wpdb;
 
 		$site_ids = [];

tests/WP_Ultimo/Models/Base_Model_Test.php

@@ -59,8 +59,8 @@
 	 */
 	public function test_constructor_accepts_stdclass(): void {
 
 		$user_id = self::factory()->user->create();
 		$obj     = new \stdClass();
 		$obj->user_id = $user_id;
 
 		$customer = new Customer($obj);
@@ -559,198 +559,6 @@
 		$this->assertNotSame('2030-06-15 10:30:00', $result);
 	}
 
-	/**
-	 * Test wu_pre_get_by_id filter returns null by default (no-callback case).
-	 */
-	public function test_wu_pre_get_by_id_filter_returns_null_by_default(): void {
-
-		$user_id  = self::factory()->user->create();
-		$customer = wu_create_customer([
-			'user_id'         => $user_id,
-			'skip_validation' => true,
-		]);
-
-		$this->assertNotWPError($customer);
-		$customer_id = $customer->get_id();
-
-		// No callback registered — filter returns null, normal query proceeds.
-		$result = Customer::get_by_id($customer_id);
-
-		$this->assertNotFalse($result);
-		$this->assertSame($customer_id, $result->get_id());
-	}
-
-	/**
-	 * Test wu_pre_get_by_id filter returns instance when callback returns instance.
-	 */
-	public function test_wu_pre_get_by_id_filter_returns_instance_when_callback_returns_instance(): void {
-
-		$user_id  = self::factory()->user->create();
-		$customer = wu_create_customer([
-			'user_id'         => $user_id,
-			'skip_validation' => true,
-		]);
-
-		$this->assertNotWPError($customer);
-		$customer_id = $customer->get_id();
-
-		// Create a stub customer to return from the filter.
-		$stub = new Customer(['id' => 9999]);
-
-		// Register callback that returns the stub.
-		add_filter('wu_pre_get_by_id_customer', function() use ($stub) {
-			return $stub;
-		});
-
-		$result = Customer::get_by_id($customer_id);
-
-		// Should return the stub, not the real customer.
-		$this->assertSame(9999, $result->get_id());
-
-		remove_filter('wu_pre_get_by_id_customer', function() use ($stub) {
-			return $stub;
-		});
-	}
-
-	/**
-	 * Test wu_pre_get_by filter returns null by default (no-callback case).
-	 */
-	public function test_wu_pre_get_by_filter_returns_null_by_default(): void {
-
-		$user_id  = self::factory()->user->create();
-		$customer = wu_create_customer([
-			'user_id'         => $user_id,
-			'skip_validation' => true,
-		]);
-
-		$this->assertNotWPError($customer);
-
-		// No callback registered — filter returns null, normal query proceeds.
-		$result = Customer::get_by('user_id', $user_id);
-
-		$this->assertNotFalse($result);
-		$this->assertSame($user_id, $result->get_user_id());
-	}
-
-	/**
-	 * Test wu_pre_get_by filter returns instance when callback returns instance.
-	 */
-	public function test_wu_pre_get_by_filter_returns_instance_when_callback_returns_instance(): void {
-
-		$user_id  = self::factory()->user->create();
-		$customer = wu_create_customer([
-			'user_id'         => $user_id,
-			'skip_validation' => true,
-		]);
-
-		$this->assertNotWPError($customer);
-
-		// Create a stub customer to return from the filter.
-		$stub = new Customer(['id' => 8888]);
-
-		// Register callback that returns the stub.
-		add_filter('wu_pre_get_by_customer', function() use ($stub) {
-			return $stub;
-		});
-
-		$result = Customer::get_by('user_id', $user_id);
-
-		// Should return the stub, not the real customer.
-		$this->assertSame(8888, $result->get_id());
-
-		remove_filter('wu_pre_get_by_customer', function() use ($stub) {
-			return $stub;
-		});
-	}
-
-	/**
-	 * Test wu_pre_get_by_hash filter returns null by default (no-callback case).
-	 */
-	public function test_wu_pre_get_by_hash_filter_returns_null_by_default(): void {
-
-		$user_id  = self::factory()->user->create();
-		$customer = wu_create_customer([
-			'user_id'         => $user_id,
-			'skip_validation' => true,
-		]);
-
-		$this->assertNotWPError($customer);
-
-		$hash = $customer->get_hash('id');
-
-		// No callback registered — filter returns null, normal query proceeds.
-		$result = Customer::get_by_hash($hash);
-
-		$this->assertNotFalse($result);
-		$this->assertSame($customer->get_id(), $result->get_id());
-	}
-
-	/**
-	 * Test wu_pre_get_by_hash filter returns instance when callback returns instance.
-	 */
-	public function test_wu_pre_get_by_hash_filter_returns_instance_when_callback_returns_instance(): void {
-
-		$user_id  = self::factory()->user->create();
-		$customer = wu_create_customer([
-			'user_id'         => $user_id,
-			'skip_validation' => true,
-		]);
-
-		$this->assertNotWPError($customer);
-
-		$hash = $customer->get_hash('id');
-
-		// Create a stub customer to return from the filter.
-		$stub = new Customer(['id' => 7777]);
-
-		// Register callback that returns the stub.
-		add_filter('wu_pre_get_by_hash_customer', function() use ($stub) {
-			return $stub;
-		});
-
-		$result = Customer::get_by_hash($hash);
-
-		// Should return the stub, not the real customer.
-		$this->assertSame(7777, $result->get_id());
-
-		remove_filter('wu_pre_get_by_hash_customer', function() use ($stub) {
-			return $stub;
-		});
-	}
-
-	/**
-	 * Test wu_pre_get_by_id filter discriminates by model name.
-	 */
-	public function test_wu_pre_get_by_id_filter_discriminates_by_model(): void {
-
-		$user_id  = self::factory()->user->create();
-		$customer = wu_create_customer([
-			'user_id'         => $user_id,
-			'skip_validation' => true,
-		]);
-
-		$this->assertNotWPError($customer);
-		$customer_id = $customer->get_id();
-
-		// Create a stub to return from the filter.
-		$stub = new Customer(['id' => 6666]);
-
-		// Register callback for 'membership' model (not 'customer').
-		add_filter('wu_pre_get_by_id_membership', function() use ($stub) {
-			return $stub;
-		});
-
-		// Customer::get_by_id should NOT be affected by the 'membership' filter.
-		$result = Customer::get_by_id($customer_id);
-
-		$this->assertNotFalse($result);
-		$this->assertSame($customer_id, $result->get_id());
-
-		remove_filter('wu_pre_get_by_id_membership', function() use ($stub) {
-			return $stub;
-		});
-	}
-
 	/**
 	 * Tear down test environment.
 	 */