upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 09:13:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

fix: PHP 7.4 compatibility

Browse source 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2023-07-10 12:07:08 +02:00
parent 33b9ba5cd9
commit 2ca8c7102b
No known key found for this signature in database
GPG key ID: 7424F1874854DF23
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/dav/lib/Connector/Sabre/FilesReportPlugin.php
View file

@ -442,7 +442,11 @@ class FilesReportPlugin extends ServerPlugin {
return $results;
}
protected function wrapNode(\OCP\Files\File|\OCP\Files\Folder $node): File|Directory {
/**
* @param \OCP\Files\File|\OCP\Files\Folder $node
* @return File|Directory
*/
protected function wrapNode($node): \OCA\DAV\Connector\Sabre\Node {
if ($node instanceof \OCP\Files\File) {
return new File($this->fileView, $node);
} else {

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

@ -66,7 +66,8 @@ class FilesReportPluginTest extends \Test\TestCase {
/** @var ITags|MockObject */
private $privateTags;
private ITagManager|MockObject $privateTagManager;
/** @var ITagManager|MockObject|(object&MockObject)|(ITagManager&object&MockObject)|(ITagManager&MockObject) */
private $privateTagManager;
/** @var \OCP\IUserSession */
private $userSession;

2
lib/private/Files/Cache/QuerySearchHelper.php
View file

@ -64,7 +64,7 @@ class QuerySearchHelper {
LoggerInterface $logger,
SearchBuilder $searchBuilder,
QueryOptimizer $queryOptimizer,
IGroupManager $groupManager,
IGroupManager $groupManager
) {
$this->mimetypeLoader = $mimetypeLoader;
$this->connection = $connection;

2
lib/private/Files/Node/Folder.php
View file

@ -331,7 +331,7 @@ class Folder extends Node implements \OCP\Files\Folder {
* @param int $id
* @return array
*/
protected function getByIdInRootMount(int $id): array {
protected function getByIdInRootMount(int $id): array {
if (!method_exists($this->root, 'createNode')) {
// Always expected to be false. Being a method of Folder, this is
// always implemented. For it is an internal method and should not