From b70b9d1139405a501665431d434904e74daf3e50 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 11 Oct 2020 23:26:17 +0200 Subject: [PATCH] Revert "Replace IHTTPResult for CurlResult usages" This reverts commit 97167d7b --- src/Model/GServer.php | 13 ++++++------- src/Network/CurlResult.php | 2 +- src/Network/IHTTPRequest.php | 6 +++--- tests/src/Core/InstallerTest.php | 26 +++++++++++++------------- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/Model/GServer.php b/src/Model/GServer.php index ac86ef38b9..323a23f494 100644 --- a/src/Model/GServer.php +++ b/src/Model/GServer.php @@ -30,7 +30,7 @@ use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Module\Register; -use Friendica\Network\IHTTPResult; +use Friendica\Network\CurlResult; use Friendica\Protocol\Diaspora; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; @@ -630,19 +630,18 @@ class GServer /** * Detect server type by using the nodeinfo data * - * @param string $url address of the server - * @param IHTTPResult $httpResult - * + * @param string $url address of the server + * @param CurlResult $curlResult * @return array Server data * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private static function fetchNodeinfo(string $url, IHTTPResult $httpResult) + private static function fetchNodeinfo(string $url, CurlResult $curlResult) { - if (!$httpResult->isSuccess()) { + if (!$curlResult->isSuccess()) { return []; } - $nodeinfo = json_decode($httpResult->getBody(), true); + $nodeinfo = json_decode($curlResult->getBody(), true); if (!is_array($nodeinfo) || empty($nodeinfo['links'])) { return []; diff --git a/src/Network/CurlResult.php b/src/Network/CurlResult.php index 1187e45eb6..072ab15c27 100644 --- a/src/Network/CurlResult.php +++ b/src/Network/CurlResult.php @@ -101,7 +101,7 @@ class CurlResult implements IHTTPResult * * @param string $url optional URL * - * @return IHTTPResult a CURL with error response + * @return CurlResult a CURL with error response * @throws InternalServerErrorException */ public static function createErrorCurl($url = '') diff --git a/src/Network/IHTTPRequest.php b/src/Network/IHTTPRequest.php index 3f9b7f27a1..3ebcc5dc1b 100644 --- a/src/Network/IHTTPRequest.php +++ b/src/Network/IHTTPRequest.php @@ -57,7 +57,7 @@ interface IHTTPRequest * @param string $accept_content supply Accept: header with 'accept_content' as the value * @param string $cookiejar Path to cookie jar file * - * @return IHTTPResult With all relevant information, 'body' contains the actual fetched content. + * @return CurlResult With all relevant information, 'body' contains the actual fetched content. */ public function fetchFull(string $url, bool $binary = false, int $timeout = 0, string $accept_content = '', string $cookiejar = ''); @@ -76,7 +76,7 @@ interface IHTTPRequest * 'cookiejar' => path to cookie jar file * 'header' => header array * - * @return IHTTPResult + * @return CurlResult */ public function get(string $url, bool $binary = false, array $opts = []); @@ -88,7 +88,7 @@ interface IHTTPRequest * @param array $headers HTTP headers * @param int $timeout The timeout in seconds, default system config value or 60 seconds * - * @return IHTTPResult The content + * @return CurlResult The content */ public function post(string $url, $params, array $headers = [], int $timeout = 0); diff --git a/tests/src/Core/InstallerTest.php b/tests/src/Core/InstallerTest.php index 37a754bc91..00879680ee 100644 --- a/tests/src/Core/InstallerTest.php +++ b/tests/src/Core/InstallerTest.php @@ -25,7 +25,7 @@ namespace Friendica\Core; use Dice\Dice; use Friendica\Core\Config\Cache; use Friendica\DI; -use Friendica\Network\IHTTPResult; +use Friendica\Network\CurlResult; use Friendica\Network\IHTTPRequest; use Friendica\Test\MockedTest; use Friendica\Test\Util\VFSTrait; @@ -297,14 +297,14 @@ class InstallerTest extends MockedTest $this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; }); // Mocking the CURL Response - $IHTTPResult = \Mockery::mock(IHTTPResult::class); - $IHTTPResult + $curlResult = \Mockery::mock(CurlResult::class); + $curlResult ->shouldReceive('getReturnCode') ->andReturn('404'); - $IHTTPResult + $curlResult ->shouldReceive('getRedirectUrl') ->andReturn(''); - $IHTTPResult + $curlResult ->shouldReceive('getError') ->andReturn('test Error'); @@ -313,11 +313,11 @@ class InstallerTest extends MockedTest $networkMock ->shouldReceive('fetchFull') ->with('https://test/install/testrewrite') - ->andReturn($IHTTPResult); + ->andReturn($curlResult); $networkMock ->shouldReceive('fetchFull') ->with('http://test/install/testrewrite') - ->andReturn($IHTTPResult); + ->andReturn($curlResult); $this->dice->shouldReceive('create') ->with(IHTTPRequest::class) @@ -344,14 +344,14 @@ class InstallerTest extends MockedTest $this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; }); // Mocking the failed CURL Response - $IHTTPResultF = \Mockery::mock(IHTTPResult::class); - $IHTTPResultF + $curlResultF = \Mockery::mock(CurlResult::class); + $curlResultF ->shouldReceive('getReturnCode') ->andReturn('404'); // Mocking the working CURL Response - $IHTTPResultW = \Mockery::mock(IHTTPResult::class); - $IHTTPResultW + $curlResultW = \Mockery::mock(CurlResult::class); + $curlResultW ->shouldReceive('getReturnCode') ->andReturn('204'); @@ -360,11 +360,11 @@ class InstallerTest extends MockedTest $networkMock ->shouldReceive('fetchFull') ->with('https://test/install/testrewrite') - ->andReturn($IHTTPResultF); + ->andReturn($curlResultF); $networkMock ->shouldReceive('fetchFull') ->with('http://test/install/testrewrite') - ->andReturn($IHTTPResultW); + ->andReturn($curlResultW); $this->dice->shouldReceive('create') ->with(IHTTPRequest::class)