Changeset 55029 for trunk/tests/phpunit/tests/https-detection.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/https-detection.php (modified) (1 diff)

trunk/tests/phpunit/tests/https-detection.php

@@ -265 +265 @@
     }
 
-    public function record_request_url( $preempt, $parsed_args, $url ) {
+    public function record_request_url( $response, $parsed_args, $url ) {
         $this->last_request_url = $url;
-        return $preempt;
-    }
-
-    public function mock_success_with_sslverify( $preempt, $parsed_args ) {
+        return $response;
+    }
+
+    public function mock_success_with_sslverify( $response, $parsed_args ) {
         if ( ! empty( $parsed_args['sslverify'] ) ) {
             return $this->mock_success();
         }
-        return $preempt;
-    }
-
-    public function mock_error_with_sslverify( $preempt, $parsed_args ) {
+        return $response;
+    }
+
+    public function mock_error_with_sslverify( $response, $parsed_args ) {
         if ( ! empty( $parsed_args['sslverify'] ) ) {
             return $this->mock_error();
         }
-        return $preempt;
-    }
-
-    public function mock_success_without_sslverify( $preempt, $parsed_args ) {
+        return $response;
+    }
+
+    public function mock_success_without_sslverify( $response, $parsed_args ) {
         if ( empty( $parsed_args['sslverify'] ) ) {
             return $this->mock_success();
         }
-        return $preempt;
-    }
-
-    public function mock_error_without_sslverify( $preempt, $parsed_args ) {
+        return $response;
+    }
+
+    public function mock_error_without_sslverify( $response, $parsed_args ) {
         if ( empty( $parsed_args['sslverify'] ) ) {
             return $this->mock_error();
         }
-        return $preempt;
+        return $response;
     }