tidy: code reuse

Author: g105b

src/Response.php

@@ -24,6 +24,8 @@
  * @property-read UriInterface $url
  * @SuppressWarnings("UnusedPrivateMethod")
  * @SuppressWarnings("TooManyPublicMethods")
+ * @SuppressWarnings("TooManyMethods")
+ * @SuppressWarnings("ExcessiveClassComplexity")
  */
 class Response implements ResponseInterface {
 	use Message;
@@ -196,11 +198,7 @@ public function endDeferredResponse(?string $integrity = null):void {
 	public function arrayBuffer():Promise {
 		$promise = $this->getPromise();
 		$promise->then(function(string $responseText) {
-			$bytes = strlen($responseText);
-			$arrayBuffer = new ArrayBuffer($bytes);
-			for($i = 0; $i < $bytes; $i++) {
-				$arrayBuffer->offsetSet($i, ord($responseText[$i]));
-			}
+			$arrayBuffer = $this->arrayBufferFromResponseText($responseText);
 
 			$this->deferred->resolve($arrayBuffer);
 		});
@@ -210,12 +208,8 @@ public function arrayBuffer():Promise {
 
 	public function awaitArrayBuffer():ArrayBuffer {
 		$arrayBuffer = null;
-		if($bodyText = $this->getBody()->getContents()) {
-			$bytes = strlen($bodyText);
-			$arrayBuffer = new ArrayBuffer($bytes);
-			for($i = 0; $i < $bytes; $i++) {
-				$arrayBuffer->offsetSet($i, ord($bodyText[$i]));
-			}
+		if($responseText = $this->getBody()->getContents()) {
+			$arrayBuffer = $this->arrayBufferFromResponseText($responseText);
 		}
 
 		$this->arrayBuffer()->then(function(ArrayBuffer $resolved) use(&$arrayBuffer) {
@@ -225,6 +219,14 @@ public function awaitArrayBuffer():ArrayBuffer {
 		return $arrayBuffer;
 	}
 
+	private function arrayBufferFromResponseText(string $responseText):ArrayBuffer {
+		$bytes = strlen($responseText);
+		$arrayBuffer = new ArrayBuffer($bytes);
+		for($i = 0; $i < $bytes; $i++) {
+			$arrayBuffer->offsetSet($i, ord($responseText[$i]));
+		}
+	}
+
 	/**
 	 * Takes the Response's stream and reads it to completion. Returns a Promise which resolves with the result
 	 * as a Gt\Http\Blob.
@@ -235,22 +237,17 @@ public function awaitArrayBuffer():ArrayBuffer {
 	public function blob():Promise {
 		$promise = $this->getPromise();
 		$promise->then(function(string $responseText) {
-			$blobOptions = [
-				"type" => $this->getResponseHeaders()->get("content-type")?->getValues()[0],
-			];
-			$this->deferred->resolve(new Blob([$responseText], $blobOptions));
+			$blob = $this->blobFromResponseText($responseText);
+			$this->deferred->resolve($blob);
 		});
 
 		return $promise;
 	}
 
 	public function awaitBlob():Blob {
 		$blob = null;
-		if($bodyText = $this->getBody()->getContents()) {
-			$blobOptions = [
-				"type" => $this->getResponseHeaders()->get("content-type")?->getValues()[0],
-			];
-			$blob = new Blob([$bodyText], $blobOptions);
+		if($responseText = $this->getBody()->getContents()) {
+			$blob = $this->blobFromResponseText($responseText);
 		}
 
 		$this->blob()->then(function(Blob $resolved) use(&$blob) {
@@ -260,6 +257,13 @@ public function awaitBlob():Blob {
 		return $blob;
 	}
 
+	private function blobFromResponseText(string $responseText):Blob {
+		$blobOptions = [
+			"type" => $this->getResponseHeaders()->get("content-type")?->getValues()[0],
+		];
+		return new Blob([$responseText], $blobOptions);
+	}
+
 	/**
 	 * Takes the Response's stream and reads it to completion. Returns a Promise which resolves with the result
 	 * as a Gt\Http\FormData.
@@ -272,16 +276,9 @@ public function formData():Promise {
 		$newPromise = $newDeferred->getPromise();
 
 		$deferredPromise = $this->getPromise();
-		$deferredPromise->then(function(string $resolvedValue)
+		$deferredPromise->then(function(string $responseText)
 		use($newDeferred) {
-			parse_str($resolvedValue, $bodyData);
-			$formData = new FormData();
-			foreach($bodyData as $key => $value) {
-				if(is_array($value)) {
-					$value = implode(",", $value);
-				}
-				$formData->set((string)$key, (string)$value);
-			}
+			$formData = $this->formDataFromResponseText($responseText);
 			$newDeferred->resolve($formData);
 		});
 
@@ -290,15 +287,8 @@ public function formData():Promise {
 
 	public function awaitFormData():FormData {
 		$formData = null;
-		if($bodyText = $this->getBody()->getContents()) {
-			parse_str($bodyText, $bodyData);
-			$formData = new FormData();
-			foreach($bodyData as $key => $value) {
-				if(is_array($value)) {
-					$value = implode(",", $value);
-				}
-				$formData->set((string)$key, (string)$value);
-			}
+		if($responseText = $this->getBody()->getContents()) {
+			$formData = $this->formDataFromResponseText($responseText);
 		}
 
 		$this->blob()->then(function(FormData $resolved) use(&$formData) {
@@ -308,6 +298,18 @@ public function awaitFormData():FormData {
 		return $formData;
 	}
 
+	private function formDataFromResponseText(string $responseText):FormData {
+		parse_str($responseText, $bodyData);
+		$formData = new FormData();
+		foreach($bodyData as $key => $value) {
+			if(is_array($value)) {
+				$value = implode(",", $value);
+			}
+			$formData->set((string)$key, (string)$value);
+		}
+		return $formData;
+	}
+
 	/**
 	 * Takes the Response's stream and reads it to completion. Returns a Promise which resolves with the result
 	 * as a Gt\Json\JsonObject.
@@ -320,8 +322,7 @@ public function awaitFormData():FormData {
 	public function json(int $depth = 512, int $options = 0):Promise {
 		$promise = $this->getPromise();
 		$promise->then(function(string $responseText)use($depth, $options) {
-			$builder = new JsonObjectBuilder($depth, $options);
-			$json = $builder->fromJsonString($responseText);
+			$json = $this->jsonFromResponseText($responseText, $depth, $options);
 			$this->deferred->resolve($json);
 		});
 
@@ -331,9 +332,8 @@ public function json(int $depth = 512, int $options = 0):Promise {
 	/** @param int<1, max> $depth */
 	public function awaitJson(int $depth = 512, int $options = 0):JsonObject {
 		$jsonObject = null;
-		if($bodyText = $this->getBody()->getContents()) {
-			$builder = new JsonObjectBuilder();
-			$jsonObject = $builder->fromJsonString($bodyText);
+		if($responseText = $this->getBody()->getContents()) {
+			$jsonObject = $this->jsonFromResponseText($responseText);
 		}
 
 		$this->json($depth, $options)->then(function(JsonObject $resolved) use(&$jsonObject) {
@@ -343,6 +343,11 @@ public function awaitJson(int $depth = 512, int $options = 0):JsonObject {
 		return $jsonObject;
 	}
 
+	private function jsonFromResponseText(string $responseText, int $depth = 512, int $options = 0):JsonObject {
+		$builder = new JsonObjectBuilder($depth, $options);
+		return $builder->fromJsonString($responseText);
+	}
+
 	/**
 	 * Takes the Response's stream and reads it to completion. Returns a Promise which resolves with the result
 	 * as a string.