Merge branch 'develop' of github.com:bcit-ci/CodeIgniter4 into develop

Author: lonnieezell

system/Files/File.php

@@ -134,6 +134,11 @@ public function guessExtension(): ?string
 	 */
 	public function getMimeType(): string
 	{
+		if (! function_exists('finfo_open'))
+		{
+			return $this->originalMimeType ?? 'application/octet-stream';
+		}
+
 		$finfo    = finfo_open(FILEINFO_MIME_TYPE);
 		$mimeType = finfo_file($finfo, $this->getRealPath());
 		finfo_close($finfo);

system/Honeypot/Honeypot.php

@@ -1,6 +1,4 @@
 <?php
-
-
 /**
  * CodeIgniter
  *
@@ -107,7 +105,7 @@ public function attachHoneypot(ResponseInterface $response)
 		$prep_field = $this->prepareTemplate($this->config->template);
 
 		$body = $response->getBody();
-		$body = str_ireplace('</form>', $prep_field, $body);
+		$body = str_ireplace('</form>', $prep_field . '</form>', $body);
 		$response->setBody($body);
 	}