Replace IHTTPResult for CurlResult usages

This commit is contained in:
Philipp Holzer 2020-10-07 21:49:12 +02:00
parent f238f4efbe
commit 97167d7b90
No known key found for this signature in database
GPG key ID: 9A28B7D4FF5667BD
4 changed files with 24 additions and 23 deletions

View file

@ -30,7 +30,7 @@ use Friendica\Core\Worker;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Module\Register; use Friendica\Module\Register;
use Friendica\Network\CurlResult; use Friendica\Network\IHTTPResult;
use Friendica\Protocol\Diaspora; use Friendica\Protocol\Diaspora;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network; use Friendica\Util\Network;
@ -630,18 +630,19 @@ class GServer
/** /**
* Detect server type by using the nodeinfo data * Detect server type by using the nodeinfo data
* *
* @param string $url address of the server * @param string $url address of the server
* @param CurlResult $curlResult * @param IHTTPResult $httpResult
*
* @return array Server data * @return array Server data
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
private static function fetchNodeinfo(string $url, CurlResult $curlResult) private static function fetchNodeinfo(string $url, IHTTPResult $httpResult)
{ {
if (!$curlResult->isSuccess()) { if (!$httpResult->isSuccess()) {
return []; return [];
} }
$nodeinfo = json_decode($curlResult->getBody(), true); $nodeinfo = json_decode($httpResult->getBody(), true);
if (!is_array($nodeinfo) || empty($nodeinfo['links'])) { if (!is_array($nodeinfo) || empty($nodeinfo['links'])) {
return []; return [];

View file

@ -101,7 +101,7 @@ class CurlResult implements IHTTPResult
* *
* @param string $url optional URL * @param string $url optional URL
* *
* @return CurlResult a CURL with error response * @return IHTTPResult a CURL with error response
* @throws InternalServerErrorException * @throws InternalServerErrorException
*/ */
public static function createErrorCurl($url = '') public static function createErrorCurl($url = '')

View file

@ -57,7 +57,7 @@ interface IHTTPRequest
* @param string $accept_content supply Accept: header with 'accept_content' as the value * @param string $accept_content supply Accept: header with 'accept_content' as the value
* @param string $cookiejar Path to cookie jar file * @param string $cookiejar Path to cookie jar file
* *
* @return CurlResult With all relevant information, 'body' contains the actual fetched content. * @return IHTTPResult 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 = ''); 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 * 'cookiejar' => path to cookie jar file
* 'header' => header array * 'header' => header array
* *
* @return CurlResult * @return IHTTPResult
*/ */
public function get(string $url, bool $binary = false, array $opts = []); public function get(string $url, bool $binary = false, array $opts = []);
@ -88,7 +88,7 @@ interface IHTTPRequest
* @param array $headers HTTP headers * @param array $headers HTTP headers
* @param int $timeout The timeout in seconds, default system config value or 60 seconds * @param int $timeout The timeout in seconds, default system config value or 60 seconds
* *
* @return CurlResult The content * @return IHTTPResult The content
*/ */
public function post(string $url, $params, array $headers = [], int $timeout = 0); public function post(string $url, $params, array $headers = [], int $timeout = 0);

View file

@ -25,7 +25,7 @@ namespace Friendica\Core;
use Dice\Dice; use Dice\Dice;
use Friendica\Core\Config\Cache; use Friendica\Core\Config\Cache;
use Friendica\DI; use Friendica\DI;
use Friendica\Network\CurlResult; use Friendica\Network\IHTTPResult;
use Friendica\Network\IHTTPRequest; use Friendica\Network\IHTTPRequest;
use Friendica\Test\MockedTest; use Friendica\Test\MockedTest;
use Friendica\Test\Util\VFSTrait; use Friendica\Test\Util\VFSTrait;
@ -297,14 +297,14 @@ class InstallerTest extends MockedTest
$this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; }); $this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; });
// Mocking the CURL Response // Mocking the CURL Response
$curlResult = \Mockery::mock(CurlResult::class); $IHTTPResult = \Mockery::mock(IHTTPResult::class);
$curlResult $IHTTPResult
->shouldReceive('getReturnCode') ->shouldReceive('getReturnCode')
->andReturn('404'); ->andReturn('404');
$curlResult $IHTTPResult
->shouldReceive('getRedirectUrl') ->shouldReceive('getRedirectUrl')
->andReturn(''); ->andReturn('');
$curlResult $IHTTPResult
->shouldReceive('getError') ->shouldReceive('getError')
->andReturn('test Error'); ->andReturn('test Error');
@ -313,11 +313,11 @@ class InstallerTest extends MockedTest
$networkMock $networkMock
->shouldReceive('fetchFull') ->shouldReceive('fetchFull')
->with('https://test/install/testrewrite') ->with('https://test/install/testrewrite')
->andReturn($curlResult); ->andReturn($IHTTPResult);
$networkMock $networkMock
->shouldReceive('fetchFull') ->shouldReceive('fetchFull')
->with('http://test/install/testrewrite') ->with('http://test/install/testrewrite')
->andReturn($curlResult); ->andReturn($IHTTPResult);
$this->dice->shouldReceive('create') $this->dice->shouldReceive('create')
->with(IHTTPRequest::class) ->with(IHTTPRequest::class)
@ -344,14 +344,14 @@ class InstallerTest extends MockedTest
$this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; }); $this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; });
// Mocking the failed CURL Response // Mocking the failed CURL Response
$curlResultF = \Mockery::mock(CurlResult::class); $IHTTPResultF = \Mockery::mock(IHTTPResult::class);
$curlResultF $IHTTPResultF
->shouldReceive('getReturnCode') ->shouldReceive('getReturnCode')
->andReturn('404'); ->andReturn('404');
// Mocking the working CURL Response // Mocking the working CURL Response
$curlResultW = \Mockery::mock(CurlResult::class); $IHTTPResultW = \Mockery::mock(IHTTPResult::class);
$curlResultW $IHTTPResultW
->shouldReceive('getReturnCode') ->shouldReceive('getReturnCode')
->andReturn('204'); ->andReturn('204');
@ -360,11 +360,11 @@ class InstallerTest extends MockedTest
$networkMock $networkMock
->shouldReceive('fetchFull') ->shouldReceive('fetchFull')
->with('https://test/install/testrewrite') ->with('https://test/install/testrewrite')
->andReturn($curlResultF); ->andReturn($IHTTPResultF);
$networkMock $networkMock
->shouldReceive('fetchFull') ->shouldReceive('fetchFull')
->with('http://test/install/testrewrite') ->with('http://test/install/testrewrite')
->andReturn($curlResultW); ->andReturn($IHTTPResultW);
$this->dice->shouldReceive('create') $this->dice->shouldReceive('create')
->with(IHTTPRequest::class) ->with(IHTTPRequest::class)