Fix test-master CI

.github/workflows/test-master.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ["8.2", "8.3"]
+        php-versions: ["8.3", "8.5"]
 
     name: test-master
 

index.php

@@ -611,12 +611,10 @@ private function fetchUpdateServerResponse(string $updateURL): array {
 
 		if ($response === false) {
 			$curlError = curl_error($curl);
-			curl_close($curl);
 			throw new \Exception('Could not do request to updater server: ' . $curlError);
 		}
 
 		$httpCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-		curl_close($curl);
 
 		if ($httpCode !== 200 && $httpCode !== 204) {
 			$this->silentLog('[warn] update server returned HTTP ' . $httpCode);
@@ -789,7 +787,6 @@ private function downloadArchive(string $fromUrl, string $toLocation): bool {
 			fclose($fp);
 			unlink($toLocation);
 			$this->silentLog('[warn] fail to download archive from ' . $fromUrl . '. Error: ' . $httpCode . ' ' . curl_error($ch));
-			curl_close($ch);
 
 			return false;
 		}
@@ -798,7 +795,6 @@ private function downloadArchive(string $fromUrl, string $toLocation): bool {
 		$info = curl_getinfo($ch);
 		$this->silentLog('[info] download stats: size=' . $this->formatBytes((int)$info['size_download']) . ' bytes; total_time=' . round($info['total_time'], 2) . ' secs; avg speed=' . $this->formatBytes((int)$info['speed_download']) . '/sec');
 
-		curl_close($ch);
 		fclose($fp);
 
 		$this->silentLog('[info] end of downloadUpdate()');

lib/Updater.php

@@ -599,12 +599,10 @@ private function fetchUpdateServerResponse(string $updateURL): array {
 
 		if ($response === false) {
 			$curlError = curl_error($curl);
-			curl_close($curl);
 			throw new \Exception('Could not do request to updater server: ' . $curlError);
 		}
 
 		$httpCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-		curl_close($curl);
 
 		if ($httpCode !== 200 && $httpCode !== 204) {
 			$this->silentLog('[warn] update server returned HTTP ' . $httpCode);
@@ -777,7 +775,6 @@ private function downloadArchive(string $fromUrl, string $toLocation): bool {
 			fclose($fp);
 			unlink($toLocation);
 			$this->silentLog('[warn] fail to download archive from ' . $fromUrl . '. Error: ' . $httpCode . ' ' . curl_error($ch));
-			curl_close($ch);
 
 			return false;
 		}
@@ -786,7 +783,6 @@ private function downloadArchive(string $fromUrl, string $toLocation): bool {
 		$info = curl_getinfo($ch);
 		$this->silentLog('[info] download stats: size=' . $this->formatBytes((int)$info['size_download']) . ' bytes; total_time=' . round($info['total_time'], 2) . ' secs; avg speed=' . $this->formatBytes((int)$info['speed_download']) . '/sec');
 
-		curl_close($ch);
 		fclose($fp);
 
 		$this->silentLog('[info] end of downloadUpdate()');

tests/features/bootstrap/FeatureContext.php

@@ -122,7 +122,6 @@ public function theCurrentInstalledVersionIs($installed, $version) {
 				throw new \Exception('Download failed for ' . $url . ' - HTTP code: ' . $httpCode);
 			}
 
-			curl_close($ch);
 			fclose($fp);
 		}
 
@@ -237,7 +236,6 @@ public function theArchiveForVersionIsAvailableLocally(string $version): void {
 				throw new \Exception('Download failed for ' . $url . ' - HTTP code: ' . $httpCode);
 			}
 
-			curl_close($ch);
 			fclose($fp);
 		}
 	}