diff options
Diffstat (limited to 'lib/Service/CurlService.php')
-rw-r--r-- | lib/Service/CurlService.php | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/lib/Service/CurlService.php b/lib/Service/CurlService.php index c864bc14..b10afa7c 100644 --- a/lib/Service/CurlService.php +++ b/lib/Service/CurlService.php @@ -30,6 +30,7 @@ declare(strict_types=1); namespace OCA\Social\Service; +use CurlHandle; use Exception; use OCA\Social\AP; use OCA\Social\Exceptions\HostMetaException; @@ -386,9 +387,9 @@ class CurlService { /** * @param Request $request * - * @return resource + * @return CurlHandle */ - private function initRequest(Request $request) { + private function initRequest(Request $request): CurlHandle { $curl = $this->generateCurlRequest($request); $this->initRequestHeaders($curl, $request); @@ -404,7 +405,8 @@ class CurlService { curl_setopt($curl, CURLOPT_BUFFERSIZE, 128); curl_setopt($curl, CURLOPT_NOPROGRESS, false); - curl_setopt($curl, CURLOPT_PROGRESSFUNCTION, + curl_setopt( + $curl, CURLOPT_PROGRESSFUNCTION, /** * @param $downloadSize * @param int $downloaded @@ -430,8 +432,10 @@ class CurlService { /** * @param Request $request + * + * @return CurlHandle */ - private function generateCurlRequest(Request $request) { + private function generateCurlRequest(Request $request): CurlHandle { $url = $request->getUsedProtocol() . '://' . $request->getHost() . $request->getParsedUrl(); if ($request->getType() !== Request::TYPE_GET) { $curl = curl_init($url); @@ -467,10 +471,10 @@ class CurlService { } /** - * @param resource $curl + * @param CurlHandle $curl * @param Request $request */ - private function initRequestHeaders($curl, Request $request) { + private function initRequestHeaders(CurlHandle $curl, Request $request): void { $headers = []; foreach ($request->getHeaders() as $name => $value) { $headers[] = $name . ': ' . $value; @@ -481,14 +485,14 @@ class CurlService { /** - * @param resource $curl + * @param CurlHandle $curl * @param Request $request * * @throws RequestContentException * @throws RequestServerException * @throws RequestNetworkException */ - private function parseRequestResult($curl, Request $request): void { + private function parseRequestResult(CurlHandle $curl, Request $request): void { $this->parseRequestResultCurl($curl, $request); $code = curl_getinfo($curl, CURLINFO_HTTP_CODE); @@ -499,12 +503,12 @@ class CurlService { /** - * @param resource $curl + * @param CurlHandle $curl * @param Request $request * * @throws RequestNetworkException */ - private function parseRequestResultCurl($curl, Request $request) { + private function parseRequestResultCurl(CurlHandle $curl, Request $request): void { $errno = curl_errno($curl); if ($errno > 0) { throw new RequestNetworkException( |