1 files changed, 15 insertions, 11 deletions

diff --git a/tests/lib/Files/Storage/Wrapper/JailTest.php b/tests/lib/Files/Storage/Wrapper/JailTest.php
index 148bd3a4f30..0043e37ba33 100644
--- a/tests/lib/Files/Storage/Wrapper/JailTest.php
+++ b/tests/lib/Files/Storage/Wrapper/JailTest.php
@@ -1,24 +1,28 @@
 <?php
+
 /**
- * Copyright (c) 2014 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 namespace Test\Files\Storage\Wrapper;
 
+use OC\Files\Filesystem;
+use OC\Files\Storage\Temporary;
+use OC\Files\Storage\Wrapper\Jail;
+
 class JailTest extends \Test\Files\Storage\Storage {
 	/**
-	 * @var \OC\Files\Storage\Temporary
+	 * @var Temporary
 	 */
 	private $sourceStorage;
 
 	protected function setUp(): void {
 		parent::setUp();
-		$this->sourceStorage = new \OC\Files\Storage\Temporary([]);
+		$this->sourceStorage = new Temporary([]);
 		$this->sourceStorage->mkdir('foo');
-		$this->instance = new \OC\Files\Storage\Wrapper\Jail([
+		$this->instance = new Jail([
 			'storage' => $this->sourceStorage,
 			'root' => 'foo'
 		]);
@@ -28,8 +32,8 @@ class JailTest extends \Test\Files\Storage\Storage {
 		// test that nothing outside our jail is touched
 		$contents = [];
 		$dh = $this->sourceStorage->opendir('');
-		while ($file = readdir($dh)) {
-			if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
+		while (($file = readdir($dh)) !== false) {
+			if (!Filesystem::isIgnoredDir($file)) {
 				$contents[] = $file;
 			}
 		}
@@ -38,12 +42,12 @@ class JailTest extends \Test\Files\Storage\Storage {
 		parent::tearDown();
 	}
 
-	public function testMkDirRooted() {
+	public function testMkDirRooted(): void {
 		$this->instance->mkdir('bar');
 		$this->assertTrue($this->sourceStorage->is_dir('foo/bar'));
 	}
 
-	public function testFilePutContentsRooted() {
+	public function testFilePutContentsRooted(): void {
 		$this->instance->file_put_contents('bar', 'asd');
 		$this->assertEquals('asd', $this->sourceStorage->file_get_contents('foo/bar'));
 	}