bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Revert "Fix Content-Type for CurlResult class"

Browse source 
This reverts commit 02bc99f6
This commit is contained in:
Philipp Holzer 2020-10-11 23:25:33 +02:00
parent 40349bfdc4
commit 6fcbb9866f
No known key found for this signature in database
GPG key ID: 9A28B7D4FF5667BD
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Network/CurlResult.php
View file

@ -37,7 +37,7 @@ class CurlResult implements IHTTPResult
private $returnCode; private $returnCode;
/** /**
* @var string[] the content type of the Curl call * @var string the content type of the Curl call
*/ */
private $contentType; private $contentType;
@ -223,9 +223,9 @@ class CurlResult implements IHTTPResult
private function checkInfo() private function checkInfo()
{ {
if (isset($this->info['content_type'])) { if (isset($this->info['content_type'])) {
$this->contentType = [$this->info['content_type']]; $this->contentType = $this->info['content_type'];
} else { } else {
$this->contentType = []; $this->contentType = '';
} }
} }

8
tests/src/Network/CurlResultTest.php
View file

@ -68,7 +68,7 @@ class CurlResultTest extends TestCase
$this->assertFalse($curlResult->isRedirectUrl()); $this->assertFalse($curlResult->isRedirectUrl());
$this->assertSame($headerArray, $curlResult->getHeaders()); $this->assertSame($headerArray, $curlResult->getHeaders());
$this->assertSame($body, $curlResult->getBody()); $this->assertSame($body, $curlResult->getBody());
$this->assertSame(['text/html; charset=utf-8'], $curlResult->getContentType()); $this->assertSame('text/html; charset=utf-8', $curlResult->getContentType());
$this->assertSame('https://test.local', $curlResult->getUrl()); $this->assertSame('https://test.local', $curlResult->getUrl());
$this->assertSame('https://test.local', $curlResult->getRedirectUrl()); $this->assertSame('https://test.local', $curlResult->getRedirectUrl());
} }
@ -97,7 +97,7 @@ class CurlResultTest extends TestCase
$this->assertTrue($curlResult->isRedirectUrl()); $this->assertTrue($curlResult->isRedirectUrl());
$this->assertSame($headerArray, $curlResult->getHeaders()); $this->assertSame($headerArray, $curlResult->getHeaders());
$this->assertSame($body, $curlResult->getBody()); $this->assertSame($body, $curlResult->getBody());
$this->assertSame(['text/html; charset=utf-8'], $curlResult->getContentType()); $this->assertSame('text/html; charset=utf-8', $curlResult->getContentType());
$this->assertSame('https://test.local/test/it', $curlResult->getUrl()); $this->assertSame('https://test.local/test/it', $curlResult->getUrl());
$this->assertSame('https://test.other/test/it', $curlResult->getRedirectUrl()); $this->assertSame('https://test.other/test/it', $curlResult->getRedirectUrl());
} }
@ -124,7 +124,7 @@ class CurlResultTest extends TestCase
$this->assertFalse($curlResult->isRedirectUrl()); $this->assertFalse($curlResult->isRedirectUrl());
$this->assertSame($headerArray, $curlResult->getHeaders()); $this->assertSame($headerArray, $curlResult->getHeaders());
$this->assertSame($body, $curlResult->getBody()); $this->assertSame($body, $curlResult->getBody());
$this->assertSame(['text/html; charset=utf-8'], $curlResult->getContentType()); $this->assertSame('text/html; charset=utf-8', $curlResult->getContentType());
$this->assertSame('https://test.local/test/it', $curlResult->getRedirectUrl()); $this->assertSame('https://test.local/test/it', $curlResult->getRedirectUrl());
$this->assertSame('Tested error', $curlResult->getError()); $this->assertSame('Tested error', $curlResult->getError());
} }
@ -152,7 +152,7 @@ class CurlResultTest extends TestCase
$this->assertTrue($curlResult->isRedirectUrl()); $this->assertTrue($curlResult->isRedirectUrl());
$this->assertSame($headerArray, $curlResult->getHeaders()); $this->assertSame($headerArray, $curlResult->getHeaders());
$this->assertSame($body, $curlResult->getBody()); $this->assertSame($body, $curlResult->getBody());
$this->assertSame(['text/html; charset=utf-8'], $curlResult->getContentType()); $this->assertSame('text/html; charset=utf-8', $curlResult->getContentType());
$this->assertSame('https://test.local/test/it?key=value', $curlResult->getUrl()); $this->assertSame('https://test.local/test/it?key=value', $curlResult->getUrl());
$this->assertSame('https://test.other/some/?key=value', $curlResult->getRedirectUrl()); $this->assertSame('https://test.other/some/?key=value', $curlResult->getRedirectUrl());
} }