Revert "Fix Content-Type for `CurlResult` class"
authorPhilipp <admin@philipp.info>
Sun, 11 Oct 2020 21:25:33 +0000 (23:25 +0200)
committerPhilipp <admin@philipp.info>
Sun, 11 Oct 2020 21:25:33 +0000 (23:25 +0200)
This reverts commit 02bc99f6

src/Network/CurlResult.php
tests/src/Network/CurlResultTest.php

index ca1ead9..4ecdd68 100644 (file)
@@ -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 = '';
                }
        }
 
index 4bc066b..03a5288 100644 (file)
@@ -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());
        }