Changeset 55029 for trunk/tests/phpunit/tests/rest-api/rest-block-directory-controller.php

Timestamp:

01/05/2023 10:21:19 AM (2 years ago)

Author:

SergeyBiryukov

Message:

Tests: Bring some consistency to mocking HTTP requests in unit tests.

Includes:

• Renaming the $preempt parameter to $response in the pre_http_request filter to better match the context used in callbacks (returning the original value if the conditions are not met rather than preempting the request).
• Synchronizing parameter names and types in various pre_http_request callbacks in unit tests.

Follow-up to [34509], [37907], [40628], [40629], [45667], [46175], [48242], [48462], [49904], [51021], [51973], [52146], [52382], [54043], [54968].

See #56793, #56792.

File:

• trunk/tests/phpunit/tests/rest-api/rest-block-directory-controller.php (modified) (2 diffs)

trunk/tests/phpunit/tests/rest-api/rest-block-directory-controller.php

@@ -275 +275 @@
         add_filter(
             'pre_http_request',
-            static function ( $return, $args, $url ) use ( $blocked_host ) {
+            static function ( $response, $parsed_args, $url ) use ( $blocked_host ) {
                 if ( @parse_url( $url, PHP_URL_HOST ) === $blocked_host ) {
                     return new WP_Error( 'plugins_api_failed', "An expected error occurred connecting to $blocked_host because of a unit test", "cURL error 7: Failed to connect to $blocked_host port 80: Connection refused" );
@@ -281 +281 @@
                 }
 
-                return $return;
+                return $response;
             },
             10,