Revert "IHTTPResult::getContentType is now a string again"

This reverts commit 40b11442
This commit is contained in:
Philipp
2020-10-11 23:25:29 +02:00
parent 88c95a352b
commit 40349bfdc4
9 changed files with 27 additions and 23 deletions

View 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 = [];
}
}

View File

@@ -88,7 +88,7 @@ class GuzzleResponse extends Response implements IHTTPResult, ResponseInterface
/** {@inheritDoc} */
public function getContentType()
{
return implode($this->getHeader('Content-Type'));
return $this->getHeader('Content-Type');
}
/** {@inheritDoc} */

View File

@@ -19,7 +19,7 @@ interface IHTTPResult
/**
* Returns the Content Type
*
* @return string the Content Type
* @return string[] the Content Types
*/
public function getContentType();

View File

@@ -429,7 +429,7 @@ class Probe
}
// If it isn't a HTML file then exit
if (($curlResult->getContentType() != '') && !strstr(strtolower($curlResult->getContentType()), 'html')) {
if (!in_array('html', $curlResult->getContentType())) {
return false;
}