Safer number setting

Author: lloc

includes/MslsBlogCollection.php

@@ -126,12 +126,9 @@ public static function get_configured_blog_description( int $blog_id, $descripti
 	 * @return object[]|\stdClass[]
 	 */
 	public function get_blogs_of_reference_user( MslsOptions $options ) {
-		$reference_user = $options->has_value( 'reference_user' ) ? $options->reference_user : current(
-			$this->get_users(
-				'ID',
-				1
-			)
-		);
+		$reference_user = $options->has_value( 'reference_user' ) ?
+			$options->reference_user :
+			current( $this->get_users( 'ID', 1 ) );
 
 		$blogs = get_blogs_of_user( $reference_user );
 		foreach ( $blogs as $key => $blog ) {
@@ -306,17 +303,16 @@ public function get_filtered( bool $filter = false ): array {
 	 *
 	 * @return array<string, int>
 	 */
-	public function get_users( $fields = 'all', int $number = 0 ): array {
+	public function get_users( $fields = 'all', int $number = MslsAdmin::MAX_REFERENCE_USERS ): array {
 		$args = array(
 			'blog_id'     => $this->current_blog_id,
 			'orderby'     => 'registered',
 			'fields'      => $fields,
+			'number'      => $number > 0 ? $number : MslsAdmin::MAX_REFERENCE_USERS,
 			'count_total' => false,
 		);
 
-		if ( $number > 1 ) {
-			$args['number'] = $number;
-
+		if ( $number !== 1 ) { // Check total users only if not fetching a single user
 			$user_count = count_users();
 			if ( isset( $user_count['total_users'] ) && $user_count['total_users'] > $number ) {
 				/* translators: %s: maximum number of users */

tests/phpunit/TestMslsBlogCollection.php

@@ -9,10 +9,12 @@
 
 final class TestMslsBlogCollection extends MslsUnitTestCase {
 
+	const TOTAL_USERS = 3210;
+
 	protected function setUp(): void {
 		parent::setUp(); // TODO: Change the autogenerated stub
 
-		Functions\when( 'count_users' )->justReturn( array( 'total_users' => 3210 ) );
+		Functions\when( 'count_users' )->justReturn( array( 'total_users' => self::TOTAL_USERS ) );
 
 		$options = \Mockery::mock( MslsOptions::class );
 		$options->shouldReceive( 'get_order' )->andReturn( 'description' );
@@ -193,12 +195,20 @@ public function test_get_filtered(): void {
 		$this->assertIsArray( $obj->get_filtered( true ) );
 	}
 
-	public function test_get_users(): void {
+	public function test_get_users_single(): void {
+		Functions\expect( 'get_site_option' )->once()->andReturn( array() );
+
+		$obj = new MslsBlogCollection();
+
+		$this->assertIsArray( $obj->get_users( array( 'ID' ), 1 ) );
+	}
+
+	public function test_get_users_massive(): void {
 		Functions\expect( 'get_site_option' )->once()->andReturn( array() );
 
 		$obj = new MslsBlogCollection();
 
-		$this->assertIsArray( $obj->get_users() );
+		$this->assertIsArray( $obj->get_users( array( 'ID' ), self::TOTAL_USERS ) );
 	}
 
 	public function test_get_users_max() {