Fix hooks processing in cURL tests

WordPress · Sep 11, 2023 · dd91131 · dd91131
1 parent 30afc43
commit dd91131
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/Transport/Curl.php b/src/Transport/Curl.php
@@ -191,7 +191,7 @@ public function request($url, $headers = [], $data = [], $options = []) {
 
 		$this->setup_handle($url, $headers, $data, $options);
 
-		$options['hooks']->dispatch('curl.before_send', array(&$this->handle));
+		$options['hooks']->dispatch('curl.before_send', [&$this->handle]);
 
 		$this->response_data       = '';
 		$this->response_bytes      = 0;

diff --git a/tests/Transport/Curl/CurlTest.php b/tests/Transport/Curl/CurlTest.php
@@ -29,21 +29,22 @@ final class CurlTest extends BaseTestCase {
 	 * @param array $other
 	 * @return array
 	 */
-	protected function getOptions($other = array()) {
+	protected function getOptions($other = []) {
 		$options = parent::getOptions($other);
 
 		$this->curl_handle = null;
 
-		$hooks = new Hooks();
-		$hooks->register(
+		if (!array_key_exists('hooks', $options)) {
+			$options['hooks'] = new Hooks();
+		}
+
+		$options['hooks']->register(
 			'curl.before_request',
 			function ($handle) {
 				$this->curl_handle = $handle;
 			}
 		);
 
-		$options['hooks'] = $hooks;
-
 		return $options;
 	}