From 6fcbb9866f0a7b9db9f47299e80e23cd11d67aef Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 11 Oct 2020 23:25:33 +0200 Subject: [PATCH] Revert "Fix Content-Type for `CurlResult` class" This reverts commit 02bc99f6 --- src/Network/CurlResult.php | 6 +++--- tests/src/Network/CurlResultTest.php | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Network/CurlResult.php b/src/Network/CurlResult.php index ca1ead91d1..4ecdd68d10 100644 --- a/src/Network/CurlResult.php +++ b/src/Network/CurlResult.php @@ -37,7 +37,7 @@ class CurlResult implements IHTTPResult private $returnCode; /** - * @var string[] the content type of the Curl call + * @var string the content type of the Curl call */ private $contentType; @@ -223,9 +223,9 @@ class CurlResult implements IHTTPResult private function checkInfo() { if (isset($this->info['content_type'])) { - $this->contentType = [$this->info['content_type']]; + $this->contentType = $this->info['content_type']; } else { - $this->contentType = []; + $this->contentType = ''; } } diff --git a/tests/src/Network/CurlResultTest.php b/tests/src/Network/CurlResultTest.php index 4bc066b800..03a5288124 100644 --- a/tests/src/Network/CurlResultTest.php +++ b/tests/src/Network/CurlResultTest.php @@ -68,7 +68,7 @@ class CurlResultTest extends TestCase $this->assertFalse($curlResult->isRedirectUrl()); $this->assertSame($headerArray, $curlResult->getHeaders()); $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->getRedirectUrl()); } @@ -97,7 +97,7 @@ class CurlResultTest extends TestCase $this->assertTrue($curlResult->isRedirectUrl()); $this->assertSame($headerArray, $curlResult->getHeaders()); $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.other/test/it', $curlResult->getRedirectUrl()); } @@ -124,7 +124,7 @@ class CurlResultTest extends TestCase $this->assertFalse($curlResult->isRedirectUrl()); $this->assertSame($headerArray, $curlResult->getHeaders()); $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('Tested error', $curlResult->getError()); } @@ -152,7 +152,7 @@ class CurlResultTest extends TestCase $this->assertTrue($curlResult->isRedirectUrl()); $this->assertSame($headerArray, $curlResult->getHeaders()); $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.other/some/?key=value', $curlResult->getRedirectUrl()); } -- 2.20.1