nextcloud
/
server
mirror of https://github.com/nextcloud/server
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix dav application tests and code for PHP 8.1 

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2021-10-25 16:41:15 +02:00
parent 5a20e20e9e
commit 5cd5245ca8
No known key found for this signature in database
GPG Key ID: A3E2F658B28C760A
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dav/lib/Connector/Sabre/AnonymousOptionsPlugin.php
View File

@ -62,7 +62,7 @@ class AnonymousOptionsPlugin extends ServerPlugin {
* @return bool
*/
public function handleAnonymousOptions(RequestInterface $request, ResponseInterface $response) {
$isOffice = preg_match('/Microsoft Office/i', $request->getHeader('User-Agent'));
$isOffice = preg_match('/Microsoft Office/i', $request->getHeader('User-Agent') ?? '');
$emptyAuth = $request->getHeader('Authorization') === null
|| $request->getHeader('Authorization') === ''
|| trim($request->getHeader('Authorization')) === 'Bearer';

2
apps/dav/lib/Connector/Sabre/Auth.php
View File

@ -242,7 +242,7 @@ class Auth extends AbstractBasic {
}
}
if (!$this->userSession->isLoggedIn() && in_array('XMLHttpRequest', explode(',', $request->getHeader('X-Requested-With')))) {
if (!$this->userSession->isLoggedIn() && in_array('XMLHttpRequest', explode(',', $request->getHeader('X-Requested-With') ?? ''))) {
// do not re-authenticate over ajax, use dummy auth name to prevent browser popup
$response->addHeader('WWW-Authenticate','DummyBasic realm="' . $this->realm . '"');
$response->setStatus(401);

2
apps/dav/lib/Connector/Sabre/FilesReportPlugin.php
View File

@ -241,7 +241,7 @@ class FilesReportPlugin extends ServerPlugin {
*
* @return string files base uri
*/
private function getFilesBaseUri($uri, $subPath) {
private function getFilesBaseUri(string $uri, string $subPath): string {
$uri = trim($uri, '/');
$subPath = trim($subPath, '/');
if (empty($subPath)) {

2
apps/dav/lib/Upload/AssemblyStream.php
View File

@ -277,7 +277,7 @@ class AssemblyStream implements \Icewind\Streams\File {
]);
stream_wrapper_register('assembly', self::class);
try {
$wrapped = fopen('assembly://', 'r', null, $context);
$wrapped = fopen('assembly://', 'r', false, $context);
} catch (\BadMethodCallException $e) {
stream_wrapper_unregister('assembly');
throw $e;

3
apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php
View File

@ -229,6 +229,9 @@ class FilesReportPluginTest extends \Test\TestCase {
$reportTargetNode = $this->getMockBuilder(Directory::class)
->disableOriginalConstructor()
->getMock();
$reportTargetNode->expects($this->any())
->method('getPath')
->willReturn('');
$response = $this->getMockBuilder(ResponseInterface::class)
->disableOriginalConstructor()