Apply signup metadata filters before per_page pagination

Author: swissspidy

features/signup.feature

@@ -246,3 +246,19 @@ Feature: Manage signups in a multisite installation
       228
       """
 
+  Scenario: Filter signups by metadata with per_page pagination
+    Given a WP multisite install
+    And I run `wp eval "wpmu_signup_user( 'plainuser', 'plainuser@example.com' );"`
+    And I run `wp eval "wpmu_signup_user( 'adminuser', 'adminuser@example.com', array( 'add_to_blog' => 228, 'new_role' => 'administrator' ) );"`
+    And I run `wp eval "wpmu_signup_user( 'editoruser', 'editoruser@example.com', array( 'add_to_blog' => 228, 'new_role' => 'editor' ) );"`
+    And I run `wp eval "wpmu_signup_user( 'otherbloguser', 'otherbloguser@example.com', array( 'add_to_blog' => 300, 'new_role' => 'administrator' ) );"`
+
+    When I run `wp user signup list --blog_id=228 --per_page=2 --fields=user_login,blog_id --format=csv`
+    Then STDOUT should be:
+      """
+      user_login,blog_id
+      adminuser,228
+      editoruser,228
+      """
+
+

src/Signup_Command.php

@@ -138,19 +138,19 @@ public function list_( $args, $assoc_args ) {
 		 */
 		$per_page = Utils\get_flag_value( $assoc_args, 'per_page' );
 
-		$limit = $per_page ? $wpdb->prepare( 'LIMIT %d', (int) $per_page ) : '';
+		$filter_args = array_diff_key(
+			$assoc_args,
+			array_flip( array( 'fields', 'field', 'format', 'per_page' ) )
+		);
+
+		$limit = ( $per_page && empty( $filter_args ) ) ? $wpdb->prepare( 'LIMIT %d', (int) $per_page ) : '';
 
 		$query = "SELECT * FROM $wpdb->signups {$limit}";
 
 		// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- Prepared properly above.
 		$results = $wpdb->get_results( $query, ARRAY_A );
 
 		if ( $results ) {
-			$filter_args = array_diff_key(
-				$assoc_args,
-				array_flip( array( 'fields', 'field', 'format', 'per_page' ) )
-			);
-
 			foreach ( $results as $item ) {
 				$item = $this->prepare_signup_array( $item );
 
@@ -167,6 +167,10 @@ public function list_( $args, $assoc_args ) {
 			}
 		}
 
+		if ( $per_page ) {
+			$signups = array_slice( $signups, 0, (int) $per_page );
+		}
+
 		$format = Utils\get_flag_value( $assoc_args, 'format', 'table' );
 
 		$formatter = $this->get_formatter( $assoc_args );