Standardise Curl object usage throughout

PhpGt · Oct 27, 2018 · 9a40987 · 9a40987
1 parent e043855
commit 9a40987
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/src/CurlMulti.php b/src/CurlMulti.php
@@ -76,11 +76,17 @@ public function getContent(CurlInterface $curl):string {
 	 * @see http://php.net/manual/en/function.curl-multi-info-read.php
 	 * @throws CurlException on failure
 	 */
-	public function infoRead(int &$msgsInQueue = null):CurlMultiInfoInterface {
-		return new CurlMultiInfo(curl_multi_info_read(
+	public function infoRead(int &$msgsInQueue = null):?CurlMultiInfoInterface {
+		$info = curl_multi_info_read(
 			$this->mh,
 			$msgsInQueue
-		));
+		);
+
+		if(!$info) {
+			return null;
+		}
+
+		return new CurlMultiInfo($info);
 	}
 
 	/**

diff --git a/src/CurlMultiInfo.php b/src/CurlMultiInfo.php
@@ -38,7 +38,7 @@ public function getResult():int {
 	 * @see curl_multi_info_read
 	 * Resource of type curl indicates the handle which it concerns.
 	 */
-	public function getHandle() {
-		return $this->handle;
+	public function getHandle():CurlInterface {
+		return CurlObjectLookup::getObjectFromHandle($this->handle);
 	}
 }
diff --git a/src/CurlMultiInfoInterface.php b/src/CurlMultiInfoInterface.php
@@ -18,5 +18,5 @@ public function getResult():int;
 	 * @see curl_multi_info_read
 	 * Resource of type curl indicates the handle which it concerns.
 	 */
-	public function getHandle();
+	public function getHandle():CurlInterface;
 }
diff --git a/src/CurlMultiInterface.php b/src/CurlMultiInterface.php
@@ -60,7 +60,7 @@ public function getContent(CurlInterface $curl):string;
 	 * @see http://php.net/manual/en/function.curl-multi-info-read.php
 	 * @throws CurlException on failure
 	 */
-	public function infoRead(int &$msgsInQueue = null):CurlMultiInfoInterface;
+	public function infoRead(int &$msgsInQueue = null):?CurlMultiInfoInterface;
 
 	/**
 	 * Initialises a new cURL multi handle