Changeset 62205 for trunk

Timestamp:

04/03/2026 09:58:33 PM (6 days ago)

Author:

SergeyBiryukov

Message:

Tests: Move data providers and helpers in Tests_REST_Server for consistency.

This ensures that data providers or helper functions used by a single test are located next to the test, for consistency with the rest of the test suite.

Follow-up to [37905], [37943], [45809], [47239], [47260], [47351], [48947], [49252], [49257], [51960], [53110], [56096], [59032].

See #64225.

File:

• trunk/tests/phpunit/tests/rest-api/rest-server.php (modified) (5 diffs)

trunk/tests/phpunit/tests/rest-api/rest-server.php

@@ -150 +150 @@
         $this->assertSame( $status, $enveloped['status'] );
         $this->assertSame( $headers, $enveloped['headers'] );
+    }
+
+    /**
+     * Data provider.
+     *
+     * @return array
+     */
+    public function data_envelope_params() {
+        return array(
+            array( '1' ),
+            array( 'true' ),
+            array( false ),
+            array( 'alternate' ),
+            array( array( 'alternate' ) ),
+        );
     }
 
@@ -1723 +1738 @@
 
     /**
+     * Helper to setup a users and auth cookie global for the
+     * rest_send_refreshed_nonce related tests.
+     */
+    protected function helper_setup_user_for_rest_send_refreshed_nonce_tests() {
+        $author = self::factory()->user->create( array( 'role' => 'author' ) );
+        wp_set_current_user( $author );
+
+        global $wp_rest_auth_cookie;
+
+        $wp_rest_auth_cookie = true;
+    }
+
+    /**
+     * Helper to make the request and get the headers for the
+     * rest_send_refreshed_nonce related tests.
+     *
+     * @return array
+     */
+    protected function helper_make_request_and_return_headers_for_rest_send_refreshed_nonce_tests() {
+        $request = new WP_REST_Request( 'GET', '/', array() );
+        $result  = rest_get_server()->serve_request( '/' );
+
+        return rest_get_server()->sent_headers;
+    }
+
+    /**
      * Refreshed nonce should be present in header when a valid nonce is
      * passed for logged in/anonymous user and not present when nonce is not
@@ -1753 +1794 @@
 
     /**
+     * @return array {
+     *     @type array {
+     *         @type bool $has_logged_in_user Are we registering a user for the test.
+     *         @type bool $has_nonce          Is the nonce passed.
+     *     }
+     * }
+     */
+    public function data_rest_send_refreshed_nonce() {
+        return array(
+            array( true, true ),
+            array( true, false ),
+            array( false, true ),
+            array( false, false ),
+        );
+    }
+
+    /**
      * Make sure that a sanitization that transforms the argument type will not
      * cause the validation to fail.
@@ -1789 +1847 @@
 
         $this->assertSame( 200, $response->get_status() );
+    }
+
+    public function _validate_as_integer_123( $value, $request, $key ) {
+        if ( ! is_int( $value ) ) {
+            return new WP_Error( 'some-error', 'This is not valid!' );
+        }
+
+        return true;
+    }
+
+    public function _validate_as_string_foo( $value, $request, $key ) {
+        if ( ! is_string( $value ) ) {
+            return new WP_Error( 'some-error', 'This is not valid!' );
+        }
+
+        return true;
     }
 
@@ -2638 +2712 @@
         $this->assertSame( array( 'GET', 'PUT' ), $link['targetHints']['allow'] );
     }
-
-    public function _validate_as_integer_123( $value, $request, $key ) {
-        if ( ! is_int( $value ) ) {
-            return new WP_Error( 'some-error', 'This is not valid!' );
-        }
-
-        return true;
-    }
-
-    public function _validate_as_string_foo( $value, $request, $key ) {
-        if ( ! is_string( $value ) ) {
-            return new WP_Error( 'some-error', 'This is not valid!' );
-        }
-
-        return true;
-    }
-
-    /**
-     * @return array {
-     *     @type array {
-     *         @type bool $has_logged_in_user Are we registering a user for the test.
-     *         @type bool $has_nonce          Is the nonce passed.
-     *     }
-     * }
-     */
-    public function data_rest_send_refreshed_nonce() {
-        return array(
-            array( true, true ),
-            array( true, false ),
-            array( false, true ),
-            array( false, false ),
-        );
-    }
-
-    /**
-     * Helper to setup a users and auth cookie global for the
-     * rest_send_refreshed_nonce related tests.
-     */
-    protected function helper_setup_user_for_rest_send_refreshed_nonce_tests() {
-        $author = self::factory()->user->create( array( 'role' => 'author' ) );
-        wp_set_current_user( $author );
-
-        global $wp_rest_auth_cookie;
-
-        $wp_rest_auth_cookie = true;
-    }
-
-    /**
-     * Helper to make the request and get the headers for the
-     * rest_send_refreshed_nonce related tests.
-     *
-     * @return array
-     */
-    protected function helper_make_request_and_return_headers_for_rest_send_refreshed_nonce_tests() {
-        $request = new WP_REST_Request( 'GET', '/', array() );
-        $result  = rest_get_server()->serve_request( '/' );
-
-        return rest_get_server()->sent_headers;
-    }
-
-    /**
-     * Data provider.
-     *
-     * @return array
-     */
-    public function data_envelope_params() {
-        return array(
-            array( '1' ),
-            array( 'true' ),
-            array( false ),
-            array( 'alternate' ),
-            array( array( 'alternate' ) ),
-        );
-    }
 }