Merge pull request #485 from creative-commoners/pulls/1/p81fix

ENH Various fixes for PHP 8.1 compatibility

tests/php/ProtectedFileControllerTest.php

@@ -345,7 +345,11 @@ protected function assertResponseEquals($code, $body, HTTPResponse $response)
         if ($code === 200) {
             $this->assertFalse($response->isError());
             $this->assertEquals($body, $response->getBody());
-            $this->assertEquals('text/plain', $response->getHeader('Content-Type'));
+            // finfo::file() in league/flysystem Local::getMimeType() will return a mimetype of
+            // 'text/plain' for test case pdfs in php7.4 + 8.0 , though in php8.1 it will
+            // return 'application/octet-stream' which is then converted to 'application/pdf'
+            // based on the file extension
+            $this->assertTrue(in_array($response->getHeader('Content-Type'), ['text/plain', 'application/pdf']));
         } else {
             $this->assertTrue($response->isError());
         }