1 files changed, 19 insertions, 35 deletions

diff --git a/apps/files_external/tests/Storage/SwiftTest.php b/apps/files_external/tests/Storage/SwiftTest.php
index 19f185ed033..17037e76ee3 100644
--- a/apps/files_external/tests/Storage/SwiftTest.php
+++ b/apps/files_external/tests/Storage/SwiftTest.php
@@ -1,33 +1,15 @@
 <?php
+
+declare(strict_types=1);
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Christian Berendt <berendt@b1-systems.de>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * 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, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 namespace OCA\Files_External\Tests\Storage;
 
-use \OCA\Files_External\Lib\Storage\Swift;
+use GuzzleHttp\Exception\ClientException;
+use OCA\Files_External\Lib\Storage\Swift;
 
 /**
  * Class SwiftTest
@@ -37,10 +19,14 @@ use \OCA\Files_External\Lib\Storage\Swift;
  * @package OCA\Files_External\Tests\Storage
  */
 class SwiftTest extends \Test\Files\Storage\Storage {
-
 	private $config;
 
-	protected function setUp() {
+	/**
+	 * @var Swift instance
+	 */
+	protected $instance;
+
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = include('files_external/tests/config.swift.php');
@@ -50,20 +36,18 @@ class SwiftTest extends \Test\Files\Storage\Storage {
 		$this->instance = new Swift($this->config);
 	}
 
-	protected function tearDown() {
+	protected function tearDown(): void {
 		if ($this->instance) {
 			try {
-				$connection = $this->instance->getConnection();
-				$container = $connection->getContainer($this->config['bucket']);
+				$container = $this->instance->getContainer();
 
-				$objects = $container->objectList();
-				while($object = $objects->next()) {
-					$object->setName(str_replace('#','%23',$object->getName()));
+				$objects = $container->listObjects();
+				foreach ($objects as $object) {
 					$object->delete();
 				}
 
 				$container->delete();
-			} catch (\Guzzle\Http\Exception\ClientErrorResponseException $e) {
+			} catch (ClientException $e) {
 				// container didn't exist, so we don't need to delete it
 			}
 		}
@@ -71,7 +55,7 @@ class SwiftTest extends \Test\Files\Storage\Storage {
 		parent::tearDown();
 	}
 
-	public function testStat() {
+	public function testStat(): void {
 		$this->markTestSkipped('Swift doesn\'t update the parents folder mtime');
 	}
 }