IHTTPResult::getContentType is now a string again

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 20d2c8a7aa3d28df4858b1d96097ede13ed9d467..2a2d02f86f66ec6c7824b03becc1c65646ae8423 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -495,7 +495,7 @@ class Photo
                        $contType = $ret->getContentType();
                } else {
                        $img_str = '';
-                       $contType = [];
+                       $contType = '';
                }
 
                if ($quit_on_error && ($img_str == "")) {

diff --git a/src/Model/User.php b/src/Model/User.php
index 48a13e6ddbcca627a1bcdad2fec38758b09d6fa8..34a7b78a49fc2a578c49ef9fee4ad43b76722096 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -1098,7 +1098,7 @@ class User
                                $contType = $curlResult->getContentType();
                        } else {
                                $img_str = '';
-                               $contType = [];
+                               $contType = '';
                        }
 
                        $type = Images::getMimeTypeByData($img_str, $photo, $contType);

diff --git a/src/Network/CurlResult.php b/src/Network/CurlResult.php
index 9d93c8bd86a529d6e3fa62bcd10ef4cf8b837156..1c74634db48d2b67a55bf286b82160360af206be 100644 (file)
--- 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/src/Network/GuzzleResponse.php b/src/Network/GuzzleResponse.php
index 69e88b40250c3568cb3c4023e42c700cb00f9500..72d87ae9fe94d1ec8145391fd0322efe999d0639 100644 (file)
--- a/src/Network/GuzzleResponse.php
+++ b/src/Network/GuzzleResponse.php
@@ -88,7 +88,7 @@ class GuzzleResponse extends Response implements IHTTPResult, ResponseInterface
        /** {@inheritDoc} */
        public function getContentType()
        {
-               return $this->getHeader('Content-Type');
+               return implode($this->getHeader('Content-Type'));
        }
 
        /** {@inheritDoc} */

diff --git a/src/Network/IHTTPResult.php b/src/Network/IHTTPResult.php
index acee2dde983b6437754c0a044a5373d4e005a482..38a1176284368d05c93510a773de597f8c8c7d73 100644 (file)
--- a/src/Network/IHTTPResult.php
+++ b/src/Network/IHTTPResult.php
@@ -19,7 +19,7 @@ interface IHTTPResult
        /**
         * Returns the Content Type
         *
-        * @return string[] the Content Types
+        * @return string the Content Type
         */
        public function getContentType();
 

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index ef899b6c1a2b4727d66265c6f85d01ecc7896732..1115808007a99c420a8f4fadb01fd1924a868a30 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -430,7 +430,7 @@ class Probe
                }
 
                // If it isn't a HTML file then exit
-               if (!in_array('html', $curlResult->getContentType())) {
+               if (($curlResult->getContentType() != '') && !strstr(strtolower($curlResult->getContentType()), 'html')) {
                        return false;
                }
 

diff --git a/src/Util/Images.php b/src/Util/Images.php
index c1ac731b6cf9b6af18c8af606c62029ad45cbd50..1dcca2e3929a13e140df56c8829fc4d6d88758a5 100644 (file)
--- a/src/Util/Images.php
+++ b/src/Util/Images.php
@@ -75,25 +75,23 @@ class Images
        /**
         * Fetch image mimetype from the image data or guessing from the file name
         *
-        * @param string   $image_data Image data
-        * @param string   $filename   File name (for guessing the type via the extension)
-        * @param string[] $mimeTypes  possible mime types
+        * @param string $image_data Image data
+        * @param string $filename   File name (for guessing the type via the extension)
+        * @param string $mimeType   possible mime type
         *
         * @return string
         * @throws \Exception
         */
-       public static function getMimeTypeByData(string $image_data, string $filename = '', array $mimeTypes = [])
+       public static function getMimeTypeByData(string $image_data, string $filename = '', string $mimeType = '')
        {
-               foreach ($mimeTypes as $mimeType) {
-                       if (substr($mimeType, 0, 6) == 'image/') {
-                               Logger::info('Using default mime type', ['filename' => $filename, 'mime' => $mimeTypes]);
-                               return $mimeType;
-                       }
+               if (substr($mimeType, 0, 6) == 'image/') {
+                       Logger::info('Using default mime type', ['filename' => $filename, 'mime' => $mimeType]);
+                       return $mimeType;
                }
 
                $image = @getimagesizefromstring($image_data);
                if (!empty($image['mime'])) {
-                       Logger::info('Mime type detected via data', ['filename' => $filename, 'default' => $mimeTypes, 'mime' => $image['mime']]);
+                       Logger::info('Mime type detected via data', ['filename' => $filename, 'default' => $mimeType, 'mime' => $image['mime']]);
                        return $image['mime'];
                }
 

diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index 79c3928d7de5703e749f7691912b2f8b1dcda5fa..d95897b1d01c8f7d3a5843d6da166e5359779981 100644 (file)
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -272,10 +272,8 @@ class ParseUrl
                $charset = '';
                // Look for a charset, first in headers
                // Expected form: Content-Type: text/html; charset=ISO-8859-4
-               foreach ($curlResult->getContentType() as $type) {
-                       if (preg_match('/charset=([a-z0-9-_.\/]+)/i', $type, $matches)) {
-                               $charset = trim(trim(trim(array_pop($matches)), ';,'));
-                       }
+               if (preg_match('/charset=([a-z0-9-_.\/]+)/i', $curlResult->getContentType(), $matches)) {
+                       $charset = trim(trim(trim(array_pop($matches)), ';,'));
                }
 
                // Then in body that gets precedence

diff --git a/tests/src/Network/CurlResultTest.php b/tests/src/Network/CurlResultTest.php
index 19fc8c3ec9e8b37c40c72650b955c6c477f51b90..c28dc5f1b993818d7292a2d9be05074fd0cb72f5 100644 (file)
--- a/tests/src/Network/CurlResultTest.php
+++ b/tests/src/Network/CurlResultTest.php
@@ -68,7 +68,7 @@ class CurlResultTest extends TestCase
                self::assertFalse($curlResult->isRedirectUrl());
                self::assertSame($headerArray, $curlResult->getHeaders());
                self::assertSame($body, $curlResult->getBody());
-               self::assertSame(['text/html; charset=utf-8'], $curlResult->getContentType());
+               self::assertSame('text/html; charset=utf-8', $curlResult->getContentType());
                self::assertSame('https://test.local', $curlResult->getUrl());
                self::assertSame('https://test.local', $curlResult->getRedirectUrl());
        }
@@ -97,7 +97,7 @@ class CurlResultTest extends TestCase
                self::assertTrue($curlResult->isRedirectUrl());
                self::assertSame($headerArray, $curlResult->getHeaders());
                self::assertSame($body, $curlResult->getBody());
-               self::assertSame(['text/html; charset=utf-8'], $curlResult->getContentType());
+               self::assertSame('text/html; charset=utf-8', $curlResult->getContentType());
                self::assertSame('https://test.local/test/it', $curlResult->getUrl());
                self::assertSame('https://test.other/test/it', $curlResult->getRedirectUrl());
        }
@@ -124,7 +124,7 @@ class CurlResultTest extends TestCase
                self::assertFalse($curlResult->isRedirectUrl());
                self::assertSame($headerArray, $curlResult->getHeaders());
                self::assertSame($body, $curlResult->getBody());
-               self::assertSame(['text/html; charset=utf-8'], $curlResult->getContentType());
+               self::assertSame('text/html; charset=utf-8', $curlResult->getContentType());
                self::assertSame('https://test.local/test/it', $curlResult->getRedirectUrl());
                self::assertSame('Tested error', $curlResult->getError());
        }
@@ -152,7 +152,7 @@ class CurlResultTest extends TestCase
                self::assertTrue($curlResult->isRedirectUrl());
                self::assertSame($headerArray, $curlResult->getHeaders());
                self::assertSame($body, $curlResult->getBody());
-               self::assertSame(['text/html; charset=utf-8'], $curlResult->getContentType());
+               self::assertSame('text/html; charset=utf-8', $curlResult->getContentType());
                self::assertSame('https://test.local/test/it?key=value', $curlResult->getUrl());
                self::assertSame('https://test.other/some/?key=value', $curlResult->getRedirectUrl());
        }