From 02bc99f67ba416455201ee6c249669fcbcca4e17 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Sat, 10 Oct 2020 18:58:45 +0200
Subject: [PATCH] Fix Content-Type for `CurlResult` class
---
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 4ecdd68d10..ca1ead91d1 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 03a5288124..4bc066b800 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.39.5