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

Clean up

Author: zachborboa

src/Curl/Curl.php

@@ -304,7 +304,7 @@ public function download($url, $mixed_filename)
     {
         if (is_callable($mixed_filename)) {
             $this->downloadCompleteFunction = $mixed_filename;
-            $fh = tmpfile();
+            $this->fileHandle = tmpfile();
         } else {
             $filename = $mixed_filename;
 
@@ -322,17 +322,16 @@ public function download($url, $mixed_filename)
                 $range = $first_byte_position . '-';
                 $this->setOpt(CURLOPT_RANGE, $range);
             }
-            $fh = fopen($download_filename, $mode);
+            $this->fileHandle = fopen($download_filename, $mode);
 
             // Move the downloaded temporary file to the destination save path.
             $this->downloadCompleteFunction = function ($fh) use ($download_filename, $filename) {
                 rename($download_filename, $filename);
             };
         }
 
-        $this->setOpt(CURLOPT_FILE, $fh);
+        $this->setOpt(CURLOPT_FILE, $this->fileHandle);
         $this->get($url);
-        $this->downloadComplete($fh);
 
         return ! $this->error;
     }

tests/PHPCurlClass/PHPCurlClassTest.php

@@ -2620,7 +2620,8 @@ public function testEmptyResponse()
         $reflection_method->setAccessible(true);
 
         $curl = new Curl();
-        $reflection_method->invoke($curl, $response);
+        $response_headers = $reflection_method->invoke($curl, $response);
+        $this->assertArrayHasKey('Status-Line', $response_headers);
     }
 
     public function testArrayToStringConversion()

tests/PHPCurlClass/PHPMultiCurlClassTest.php

@@ -2461,9 +2461,13 @@ public function testAddCurl()
         $curl->setOpt(CURLOPT_CUSTOMREQUEST, 'GET');
         $curl->setOpt(CURLOPT_HTTPGET, true);
 
+        $complete_called = false;
         $multi_curl = new MultiCurl();
-        $multi_curl->addCurl($curl);
+        $multi_curl->addCurl($curl)->complete(function ($instance) use (&$complete_called) {
+            $complete_called = true;
+        });
         $multi_curl->start();
+        $this->assertTrue($complete_called);
     }
 
     public function testSequentialId()