4 files changed, 18 insertions, 16 deletions

diff --git a/tests/lib/Files/Mount/ManagerTest.php b/tests/lib/Files/Mount/ManagerTest.php
index 12338c18dbd..b2ddf2d8ef4 100644
--- a/tests/lib/Files/Mount/ManagerTest.php
+++ b/tests/lib/Files/Mount/ManagerTest.php
@@ -7,6 +7,7 @@
 
 namespace Test\Files\Mount;
 
+use OC\Files\Mount\MountPoint;
 use OC\Files\SetupManagerFactory;
 use OC\Files\Storage\Temporary;
 
@@ -28,33 +29,33 @@ class ManagerTest extends \Test\TestCase {
 	}
 
 	public function testFind(): void {
-		$rootMount = new \OC\Files\Mount\MountPoint(new Temporary([]), '/');
+		$rootMount = new MountPoint(new Temporary([]), '/');
 		$this->manager->addMount($rootMount);
 		$this->assertEquals($rootMount, $this->manager->find('/'));
 		$this->assertEquals($rootMount, $this->manager->find('/foo/bar'));
 
 		$storage = new Temporary([]);
-		$mount1 = new \OC\Files\Mount\MountPoint($storage, '/foo');
+		$mount1 = new MountPoint($storage, '/foo');
 		$this->manager->addMount($mount1);
 		$this->assertEquals($rootMount, $this->manager->find('/'));
 		$this->assertEquals($mount1, $this->manager->find('/foo/bar'));
 
 		$this->assertEquals(1, count($this->manager->findIn('/')));
-		$mount2 = new \OC\Files\Mount\MountPoint(new Temporary([]), '/bar');
+		$mount2 = new MountPoint(new Temporary([]), '/bar');
 		$this->manager->addMount($mount2);
 		$this->assertEquals(2, count($this->manager->findIn('/')));
 
 		$id = $mount1->getStorageId();
 		$this->assertEquals([$mount1], $this->manager->findByStorageId($id));
 
-		$mount3 = new \OC\Files\Mount\MountPoint($storage, '/foo/bar');
+		$mount3 = new MountPoint($storage, '/foo/bar');
 		$this->manager->addMount($mount3);
 		$this->assertEquals([$mount1, $mount3], $this->manager->findByStorageId($id));
 	}
 
 	public function testLong(): void {
 		$storage = new LongId([]);
-		$mount = new \OC\Files\Mount\MountPoint($storage, '/foo');
+		$mount = new MountPoint($storage, '/foo');
 		$this->manager->addMount($mount);
 
 		$id = $mount->getStorageId();
diff --git a/tests/lib/Files/Mount/MountPointTest.php b/tests/lib/Files/Mount/MountPointTest.php
index 96987c9f5eb..af66a9028eb 100644
--- a/tests/lib/Files/Mount/MountPointTest.php
+++ b/tests/lib/Files/Mount/MountPointTest.php
@@ -7,6 +7,7 @@
 
 namespace Test\Files\Mount;
 
+use OC\Files\Mount\MountPoint;
 use OC\Files\Storage\StorageFactory;
 use OC\Lockdown\Filesystem\NullStorage;
 use OCP\Files\Storage\IStorage;
@@ -23,7 +24,7 @@ class MountPointTest extends \Test\TestCase {
 			->method('wrap')
 			->willReturn($storage);
 
-		$mountPoint = new \OC\Files\Mount\MountPoint(
+		$mountPoint = new MountPoint(
 			// just use this because a real class is needed
 			NullStorage::class,
 			'/mountpoint',
@@ -43,14 +44,14 @@ class MountPointTest extends \Test\TestCase {
 		$loader = $this->createMock(StorageFactory::class);
 		$loader->expects($this->once())
 			->method('wrap')
-			->will($this->throwException(new \Exception('Test storage init exception')));
+			->willThrowException(new \Exception('Test storage init exception'));
 
 		$called = false;
-		$wrapper = function ($mountPoint, $storage) use ($called) {
+		$wrapper = function ($mountPoint, $storage) use ($called): void {
 			$called = true;
 		};
 
-		$mountPoint = new \OC\Files\Mount\MountPoint(
+		$mountPoint = new MountPoint(
 			// just use this because a real class is needed
 			NullStorage::class,
 			'/mountpoint',
diff --git a/tests/lib/Files/Mount/MountTest.php b/tests/lib/Files/Mount/MountTest.php
index 76d70cdd214..7be7fc67cd6 100644
--- a/tests/lib/Files/Mount/MountTest.php
+++ b/tests/lib/Files/Mount/MountTest.php
@@ -7,6 +7,7 @@
 
 namespace Test\Files\Mount;
 
+use OC\Files\Mount\MountPoint;
 use OC\Files\Storage\StorageFactory;
 use OC\Files\Storage\Wrapper\Wrapper;
 
@@ -15,12 +16,12 @@ class MountTest extends \Test\TestCase {
 		$storage = $this->getMockBuilder('\OC\Files\Storage\Temporary')
 			->disableOriginalConstructor()
 			->getMock();
-		$mount = new \OC\Files\Mount\MountPoint($storage, '/foo');
+		$mount = new MountPoint($storage, '/foo');
 		$this->assertInstanceOf('\OC\Files\Storage\Temporary', $mount->getStorage());
 	}
 
 	public function testFromStorageClassname(): void {
-		$mount = new \OC\Files\Mount\MountPoint('\OC\Files\Storage\Temporary', '/foo');
+		$mount = new MountPoint('\OC\Files\Storage\Temporary', '/foo');
 		$this->assertInstanceOf('\OC\Files\Storage\Temporary', $mount->getStorage());
 	}
 
@@ -38,7 +39,7 @@ class MountTest extends \Test\TestCase {
 		$storage = $this->getMockBuilder('\OC\Files\Storage\Temporary')
 			->disableOriginalConstructor()
 			->getMock();
-		$mount = new \OC\Files\Mount\MountPoint($storage, '/foo', [], $loader);
+		$mount = new MountPoint($storage, '/foo', [], $loader);
 		$this->assertInstanceOf('\OC\Files\Storage\Wrapper\Wrapper', $mount->getStorage());
 	}
 }
diff --git a/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php b/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php
index 2b809835953..c0b49813c93 100644
--- a/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php
+++ b/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php
@@ -241,10 +241,9 @@ class ObjectHomeMountProviderTest extends \Test\TestCase {
 }
 
 class FakeObjectStore implements IObjectStore {
-	private $arguments;
-
-	public function __construct(array $arguments) {
-		$this->arguments = $arguments;
+	public function __construct(
+		private array $arguments,
+	) {
 	}
 
 	public function getArguments() {