1 files changed, 21 insertions, 51 deletions

diff --git a/apps/dav/tests/unit/Direct/DirectFileTest.php b/apps/dav/tests/unit/Direct/DirectFileTest.php
index 73722bccb96..f6f0f49fa8c 100644
--- a/apps/dav/tests/unit/Direct/DirectFileTest.php
+++ b/apps/dav/tests/unit/Direct/DirectFileTest.php
@@ -3,29 +3,10 @@
 declare(strict_types=1);
 
 /**
- * @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-
-namespace OCA\DAV\Tests\Unit\Direct;
+namespace OCA\DAV\Tests\unit\Direct;
 
 use OCA\DAV\Db\Direct;
 use OCA\DAV\Direct\DirectFile;
@@ -33,28 +14,17 @@ use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\File;
 use OCP\Files\Folder;
 use OCP\Files\IRootFolder;
+use PHPUnit\Framework\MockObject\MockObject;
 use Sabre\DAV\Exception\Forbidden;
 use Test\TestCase;
 
 class DirectFileTest extends TestCase {
-
-	/** @var Direct */
-	private $direct;
-
-	/** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */
-	private $rootFolder;
-
-	/** @var Folder|\PHPUnit\Framework\MockObject\MockObject */
-	private $userFolder;
-
-	/** @var File|\PHPUnit\Framework\MockObject\MockObject */
-	private $file;
-
-	/** @var DirectFile */
-	private $directFile;
-
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
+	private Direct $direct;
+	private IRootFolder&MockObject $rootFolder;
+	private Folder&MockObject $userFolder;
+	private File&MockObject $file;
+	private IEventDispatcher&MockObject $eventDispatcher;
+	private DirectFile $directFile;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -73,66 +43,66 @@ class DirectFileTest extends TestCase {
 			->willReturn($this->userFolder);
 
 		$this->file = $this->createMock(File::class);
-		$this->userFolder->method('getById')
+		$this->userFolder->method('getFirstNodeById')
 			->with(42)
-			->willReturn([$this->file]);
+			->willReturn($this->file);
 
 		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
 
 		$this->directFile = new DirectFile($this->direct, $this->rootFolder, $this->eventDispatcher);
 	}
 
-	public function testPut() {
+	public function testPut(): void {
 		$this->expectException(Forbidden::class);
 
 		$this->directFile->put('foo');
 	}
 
-	public function testGet() {
+	public function testGet(): void {
 		$this->file->expects($this->once())
 			->method('fopen')
 			->with('rb');
 		$this->directFile->get();
 	}
 
-	public function testGetContentType() {
+	public function testGetContentType(): void {
 		$this->file->method('getMimeType')
 			->willReturn('direct/type');
 
 		$this->assertSame('direct/type', $this->directFile->getContentType());
 	}
 
-	public function testGetETag() {
+	public function testGetETag(): void {
 		$this->file->method('getEtag')
 			->willReturn('directEtag');
 
 		$this->assertSame('directEtag', $this->directFile->getETag());
 	}
 
-	public function testGetSize() {
+	public function testGetSize(): void {
 		$this->file->method('getSize')
 			->willReturn(42);
 
 		$this->assertSame(42, $this->directFile->getSize());
 	}
 
-	public function testDelete() {
+	public function testDelete(): void {
 		$this->expectException(Forbidden::class);
 
 		$this->directFile->delete();
 	}
 
-	public function testGetName() {
+	public function testGetName(): void {
 		$this->assertSame('directToken', $this->directFile->getName());
 	}
 
-	public function testSetName() {
+	public function testSetName(): void {
 		$this->expectException(Forbidden::class);
 
 		$this->directFile->setName('foobar');
 	}
 
-	public function testGetLastModified() {
+	public function testGetLastModified(): void {
 		$this->file->method('getMTime')
 			->willReturn(42);