Merge pull request php-curl-class#245 from zachborboa/master

Close MultiCurl resource only when still open

Author: zachborboa

src/Curl/Curl.php

@@ -4,7 +4,7 @@
 
 class Curl
 {
-    const VERSION = '4.7.0';
+    const VERSION = '4.7.1';
     const DEFAULT_TIMEOUT = 30;
 
     public $curl;

src/Curl/MultiCurl.php

@@ -261,7 +261,9 @@ public function close()
             $ch->close();
         }
 
-        curl_multi_close($this->multiCurl);
+        if (is_resource($this->multiCurl)) {
+            curl_multi_close($this->multiCurl);
+        }
     }
 
     /**

tests/PHPCurlClass/PHPMultiCurlClassTest.php

@@ -1988,4 +1988,14 @@ public function testAddRequestAfterStart() {
             $this->assertTrue(in_array($url, $urls_called, true));
         }
     }
+
+    public function testClose()
+    {
+        $multi_curl = new MultiCurl();
+        $multi_curl->addGet(Test::TEST_URL);
+        $multi_curl->start();
+        $this->assertTrue(is_resource($multi_curl->multiCurl));
+        $multi_curl->close();
+        $this->assertFalse(is_resource($multi_curl->multiCurl));
+    }
 }