nextcloud / server

apps/files_external/tests/FrontendDefinitionTraitTest.php

Indentation +81 added lines, -81 removed lines

@@ -10,98 +10,98 @@
 use OCA\Files_External\Lib\StorageConfig;
 
 class FrontendDefinitionTraitTest extends \Test\TestCase {
-	public function testJsonSerialization(): void {
-		$param = $this->getMockBuilder(DefinitionParameter::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$param->method('getName')->willReturn('foo');
+    public function testJsonSerialization(): void {
+        $param = $this->getMockBuilder(DefinitionParameter::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $param->method('getName')->willReturn('foo');
 
-		$trait = $this->getMockForTrait(\OCA\Files_External\Lib\FrontendDefinitionTrait::class);
-		$trait->setText('test');
-		$trait->addParameters([$param]);
-		$trait->addCustomJs('foo/bar.js');
-		$trait->addCustomJs('bar/foo.js');
+        $trait = $this->getMockForTrait(\OCA\Files_External\Lib\FrontendDefinitionTrait::class);
+        $trait->setText('test');
+        $trait->addParameters([$param]);
+        $trait->addCustomJs('foo/bar.js');
+        $trait->addCustomJs('bar/foo.js');
 
-		$json = $trait->jsonSerializeDefinition();
+        $json = $trait->jsonSerializeDefinition();
 
-		$this->assertEquals('test', $json['name']);
-		$this->assertContains('foo/bar.js', $json['custom']);
-		$this->assertContains('bar/foo.js', $json['custom']);
+        $this->assertEquals('test', $json['name']);
+        $this->assertContains('foo/bar.js', $json['custom']);
+        $this->assertContains('bar/foo.js', $json['custom']);
 
-		$configuration = $json['configuration'];
-		$this->assertArrayHasKey('foo', $configuration);
-	}
+        $configuration = $json['configuration'];
+        $this->assertArrayHasKey('foo', $configuration);
+    }
 
-	public static function validateStorageProvider(): array {
-		return [
-			[true, ['foo' => true, 'bar' => true, 'baz' => true]],
-			[false, ['foo' => true, 'bar' => false]]
-		];
-	}
+    public static function validateStorageProvider(): array {
+        return [
+            [true, ['foo' => true, 'bar' => true, 'baz' => true]],
+            [false, ['foo' => true, 'bar' => false]]
+        ];
+    }
 
-	/**
-	 * @dataProvider validateStorageProvider
-	 */
-	public function testValidateStorage(bool $expectedSuccess, array $params): void {
-		$backendParams = [];
-		foreach ($params as $name => $valid) {
-			$param = $this->getMockBuilder(DefinitionParameter::class)
-				->disableOriginalConstructor()
-				->getMock();
-			$param->method('getName')
-				->willReturn($name);
-			$param->method('isOptional')
-				->willReturn(false);
-			$param->expects($this->once())
-				->method('validateValue')
-				->willReturn($valid);
-			$backendParams[] = $param;
-		}
+    /**
+     * @dataProvider validateStorageProvider
+     */
+    public function testValidateStorage(bool $expectedSuccess, array $params): void {
+        $backendParams = [];
+        foreach ($params as $name => $valid) {
+            $param = $this->getMockBuilder(DefinitionParameter::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+            $param->method('getName')
+                ->willReturn($name);
+            $param->method('isOptional')
+                ->willReturn(false);
+            $param->expects($this->once())
+                ->method('validateValue')
+                ->willReturn($valid);
+            $backendParams[] = $param;
+        }
 
-		$storageConfig = $this->getMockBuilder(StorageConfig::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$storageConfig->expects($this->any())
-			->method('getBackendOption')
-			->willReturn(null);
-		$storageConfig->expects($this->any())
-			->method('setBackendOption');
+        $storageConfig = $this->getMockBuilder(StorageConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $storageConfig->expects($this->any())
+            ->method('getBackendOption')
+            ->willReturn(null);
+        $storageConfig->expects($this->any())
+            ->method('setBackendOption');
 
-		$trait = $this->getMockForTrait(\OCA\Files_External\Lib\FrontendDefinitionTrait::class);
-		$trait->setText('test');
-		$trait->addParameters($backendParams);
+        $trait = $this->getMockForTrait(\OCA\Files_External\Lib\FrontendDefinitionTrait::class);
+        $trait->setText('test');
+        $trait->addParameters($backendParams);
 
-		$this->assertEquals($expectedSuccess, $trait->validateStorageDefinition($storageConfig));
-	}
+        $this->assertEquals($expectedSuccess, $trait->validateStorageDefinition($storageConfig));
+    }
 
-	public function testValidateStorageSet(): void {
-		$param = $this->getMockBuilder(DefinitionParameter::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$param->method('getName')
-			->willReturn('param');
-		$param->expects($this->once())
-			->method('validateValue')
-			->willReturnCallback(function (&$value) {
-				$value = 'foobar';
-				return true;
-			});
+    public function testValidateStorageSet(): void {
+        $param = $this->getMockBuilder(DefinitionParameter::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $param->method('getName')
+            ->willReturn('param');
+        $param->expects($this->once())
+            ->method('validateValue')
+            ->willReturnCallback(function (&$value) {
+                $value = 'foobar';
+                return true;
+            });
 
-		$storageConfig = $this->getMockBuilder(StorageConfig::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$storageConfig->expects($this->once())
-			->method('getBackendOption')
-			->with('param')
-			->willReturn('barfoo');
-		$storageConfig->expects($this->once())
-			->method('setBackendOption')
-			->with('param', 'foobar');
+        $storageConfig = $this->getMockBuilder(StorageConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $storageConfig->expects($this->once())
+            ->method('getBackendOption')
+            ->with('param')
+            ->willReturn('barfoo');
+        $storageConfig->expects($this->once())
+            ->method('setBackendOption')
+            ->with('param', 'foobar');
 
-		$trait = $this->getMockForTrait(\OCA\Files_External\Lib\FrontendDefinitionTrait::class);
-		$trait->setText('test');
-		$trait->addParameter($param);
+        $trait = $this->getMockForTrait(\OCA\Files_External\Lib\FrontendDefinitionTrait::class);
+        $trait->setText('test');
+        $trait->addParameter($param);
 
-		$this->assertEquals(true, $trait->validateStorageDefinition($storageConfig));
-	}
+        $this->assertEquals(true, $trait->validateStorageDefinition($storageConfig));
+    }
 }

apps/files_external/tests/Auth/AuthMechanismTest.php

Indentation +41 added lines, -41 removed lines

@@ -13,53 +13,53 @@
 use OCA\Files_External\Lib\StorageConfig;
 
 class AuthMechanismTest extends \Test\TestCase {
-	public function testJsonSerialization(): void {
-		$mechanism = $this->getMockBuilder(AuthMechanism::class)
-			->onlyMethods(['jsonSerializeDefinition'])
-			->getMock();
-		$mechanism->expects($this->once())
-			->method('jsonSerializeDefinition')
-			->willReturn(['foo' => 'bar']);
+    public function testJsonSerialization(): void {
+        $mechanism = $this->getMockBuilder(AuthMechanism::class)
+            ->onlyMethods(['jsonSerializeDefinition'])
+            ->getMock();
+        $mechanism->expects($this->once())
+            ->method('jsonSerializeDefinition')
+            ->willReturn(['foo' => 'bar']);
 
-		$mechanism->setScheme('scheme');
+        $mechanism->setScheme('scheme');
 
-		$json = $mechanism->jsonSerialize();
-		$this->assertEquals('bar', $json['foo']);
-		$this->assertEquals('scheme', $json['scheme']);
-	}
+        $json = $mechanism->jsonSerialize();
+        $this->assertEquals('bar', $json['foo']);
+        $this->assertEquals('scheme', $json['scheme']);
+    }
 
-	public static function validateStorageProvider(): array {
-		return [
-			[true, 'scheme', true],
-			[false, 'scheme', false],
-			[true, 'foobar', true],
-			[false, 'barfoo', true],
-		];
-	}
+    public static function validateStorageProvider(): array {
+        return [
+            [true, 'scheme', true],
+            [false, 'scheme', false],
+            [true, 'foobar', true],
+            [false, 'barfoo', true],
+        ];
+    }
 
-	/**
-	 * @dataProvider validateStorageProvider
-	 */
-	public function testValidateStorage(bool $expectedSuccess, string $scheme, bool $definitionSuccess): void {
-		$mechanism = $this->getMockBuilder(AuthMechanism::class)
-			->onlyMethods(['validateStorageDefinition'])
-			->getMock();
-		$mechanism->expects($this->atMost(1))
-			->method('validateStorageDefinition')
-			->willReturn($definitionSuccess);
+    /**
+     * @dataProvider validateStorageProvider
+     */
+    public function testValidateStorage(bool $expectedSuccess, string $scheme, bool $definitionSuccess): void {
+        $mechanism = $this->getMockBuilder(AuthMechanism::class)
+            ->onlyMethods(['validateStorageDefinition'])
+            ->getMock();
+        $mechanism->expects($this->atMost(1))
+            ->method('validateStorageDefinition')
+            ->willReturn($definitionSuccess);
 
-		$mechanism->setScheme($scheme);
+        $mechanism->setScheme($scheme);
 
-		$backend = $this->createMock(Backend::class);
-		$backend->expects($this->once())
-			->method('getAuthSchemes')
-			->willReturn(['scheme' => true, 'foobar' => true]);
+        $backend = $this->createMock(Backend::class);
+        $backend->expects($this->once())
+            ->method('getAuthSchemes')
+            ->willReturn(['scheme' => true, 'foobar' => true]);
 
-		$storageConfig = $this->createMock(StorageConfig::class);
-		$storageConfig->expects($this->once())
-			->method('getBackend')
-			->willReturn($backend);
+        $storageConfig = $this->createMock(StorageConfig::class);
+        $storageConfig->expects($this->once())
+            ->method('getBackend')
+            ->willReturn($backend);
 
-		$this->assertEquals($expectedSuccess, $mechanism->validateStorage($storageConfig));
-	}
+        $this->assertEquals($expectedSuccess, $mechanism->validateStorage($storageConfig));
+    }
 }

apps/files_external/tests/StorageConfigTest.php

Indentation +38 added lines, -38 removed lines

@@ -14,46 +14,46 @@
 use OCA\Files_External\Lib\StorageConfig;
 
 class StorageConfigTest extends \Test\TestCase {
-	public function testJsonSerialization(): void {
-		$backend = $this->createMock(Backend::class);
-		$parameter = $this->createMock(DefinitionParameter::class);
-		$parameter
-			->expects($this->once())
-			->method('getType')
-			->willReturn(1);
-		$backend
-			->expects($this->once())
-			->method('getParameters')
-			->willReturn(['secure' => $parameter]);
-		$backend->method('getIdentifier')
-			->willReturn('storage::identifier');
+    public function testJsonSerialization(): void {
+        $backend = $this->createMock(Backend::class);
+        $parameter = $this->createMock(DefinitionParameter::class);
+        $parameter
+            ->expects($this->once())
+            ->method('getType')
+            ->willReturn(1);
+        $backend
+            ->expects($this->once())
+            ->method('getParameters')
+            ->willReturn(['secure' => $parameter]);
+        $backend->method('getIdentifier')
+            ->willReturn('storage::identifier');
 
-		$authMech = $this->createMock(AuthMechanism::class);
-		$authMech->method('getIdentifier')
-			->willReturn('auth::identifier');
+        $authMech = $this->createMock(AuthMechanism::class);
+        $authMech->method('getIdentifier')
+            ->willReturn('auth::identifier');
 
-		$storageConfig = new StorageConfig(1);
-		$storageConfig->setMountPoint('test');
-		$storageConfig->setBackend($backend);
-		$storageConfig->setAuthMechanism($authMech);
-		$storageConfig->setBackendOptions(['user' => 'test', 'password' => 'password123', 'secure' => '1']);
-		$storageConfig->setPriority(128);
-		$storageConfig->setApplicableUsers(['user1', 'user2']);
-		$storageConfig->setApplicableGroups(['group1', 'group2']);
-		$storageConfig->setMountOptions(['preview' => false]);
+        $storageConfig = new StorageConfig(1);
+        $storageConfig->setMountPoint('test');
+        $storageConfig->setBackend($backend);
+        $storageConfig->setAuthMechanism($authMech);
+        $storageConfig->setBackendOptions(['user' => 'test', 'password' => 'password123', 'secure' => '1']);
+        $storageConfig->setPriority(128);
+        $storageConfig->setApplicableUsers(['user1', 'user2']);
+        $storageConfig->setApplicableGroups(['group1', 'group2']);
+        $storageConfig->setMountOptions(['preview' => false]);
 
-		$json = $storageConfig->jsonSerialize();
+        $json = $storageConfig->jsonSerialize();
 
-		$this->assertSame(1, $json['id']);
-		$this->assertSame('/test', $json['mountPoint']);
-		$this->assertSame('storage::identifier', $json['backend']);
-		$this->assertSame('auth::identifier', $json['authMechanism']);
-		$this->assertSame('test', $json['backendOptions']['user']);
-		$this->assertSame('password123', $json['backendOptions']['password']);
-		$this->assertSame(true, $json['backendOptions']['secure']);
-		$this->assertSame(128, $json['priority']);
-		$this->assertSame(['user1', 'user2'], $json['applicableUsers']);
-		$this->assertSame(['group1', 'group2'], $json['applicableGroups']);
-		$this->assertSame(['preview' => false], $json['mountOptions']);
-	}
+        $this->assertSame(1, $json['id']);
+        $this->assertSame('/test', $json['mountPoint']);
+        $this->assertSame('storage::identifier', $json['backend']);
+        $this->assertSame('auth::identifier', $json['authMechanism']);
+        $this->assertSame('test', $json['backendOptions']['user']);
+        $this->assertSame('password123', $json['backendOptions']['password']);
+        $this->assertSame(true, $json['backendOptions']['secure']);
+        $this->assertSame(128, $json['priority']);
+        $this->assertSame(['user1', 'user2'], $json['applicableUsers']);
+        $this->assertSame(['group1', 'group2'], $json['applicableGroups']);
+        $this->assertSame(['preview' => false], $json['mountOptions']);
+    }
 }

apps/files_external/tests/Storage/FtpTest.php

Indentation +69 added lines, -69 removed lines

@@ -18,73 +18,73 @@
  * @package OCA\Files_External\Tests\Storage
  */
 class FtpTest extends \Test\Files\Storage\Storage {
-	private $config;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$id = $this->getUniqueID();
-		$this->config = include('files_external/tests/config.ftp.php');
-		if (! is_array($this->config) or ! $this->config['run']) {
-			$this->markTestSkipped('FTP backend not configured');
-		}
-		$rootInstance = new FTP($this->config);
-		$rootInstance->mkdir($id);
-
-		$this->config['root'] .= '/' . $id; //make sure we have an new empty folder to work in
-		$this->instance = new FTP($this->config);
-	}
-
-	protected function tearDown(): void {
-		if ($this->instance) {
-			$this->instance->rmdir('');
-		}
-		$this->instance = null;
-
-		parent::tearDown();
-	}
-
-	/**
-	 * ftp has no proper way to handle spaces at the end of file names
-	 */
-	public static function directoryProvider(): array {
-		return array_filter(parent::directoryProvider(), function ($item) {
-			return substr($item[0], -1) !== ' ';
-		});
-	}
-
-
-	/**
-	 * mtime for folders is only with a minute resolution
-	 */
-	public function testStat(): void {
-		$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
-		$ctimeStart = time();
-		$this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile));
-		$this->assertTrue($this->instance->isReadable('/lorem.txt'));
-		$ctimeEnd = time();
-		$mTime = $this->instance->filemtime('/lorem.txt');
-		$this->assertTrue($this->instance->hasUpdated('/lorem.txt', $ctimeStart - 5));
-		$this->assertTrue($this->instance->hasUpdated('/', $ctimeStart - 61));
-
-		// check that ($ctimeStart - 5) <= $mTime <= ($ctimeEnd + 1)
-		$this->assertGreaterThanOrEqual(($ctimeStart - 5), $mTime);
-		$this->assertLessThanOrEqual(($ctimeEnd + 1), $mTime);
-		$this->assertEquals(filesize($textFile), $this->instance->filesize('/lorem.txt'));
-
-		$stat = $this->instance->stat('/lorem.txt');
-		//only size and mtime are required in the result
-		$this->assertEquals($stat['size'], $this->instance->filesize('/lorem.txt'));
-		$this->assertEquals($stat['mtime'], $mTime);
-
-		if ($this->instance->touch('/lorem.txt', 100) !== false) {
-			$mTime = $this->instance->filemtime('/lorem.txt');
-			$this->assertEquals($mTime, 100);
-		}
-
-		$mtimeStart = time();
-
-		$this->instance->unlink('/lorem.txt');
-		$this->assertTrue($this->instance->hasUpdated('/', $mtimeStart - 61));
-	}
+    private $config;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $id = $this->getUniqueID();
+        $this->config = include('files_external/tests/config.ftp.php');
+        if (! is_array($this->config) or ! $this->config['run']) {
+            $this->markTestSkipped('FTP backend not configured');
+        }
+        $rootInstance = new FTP($this->config);
+        $rootInstance->mkdir($id);
+
+        $this->config['root'] .= '/' . $id; //make sure we have an new empty folder to work in
+        $this->instance = new FTP($this->config);
+    }
+
+    protected function tearDown(): void {
+        if ($this->instance) {
+            $this->instance->rmdir('');
+        }
+        $this->instance = null;
+
+        parent::tearDown();
+    }
+
+    /**
+     * ftp has no proper way to handle spaces at the end of file names
+     */
+    public static function directoryProvider(): array {
+        return array_filter(parent::directoryProvider(), function ($item) {
+            return substr($item[0], -1) !== ' ';
+        });
+    }
+
+
+    /**
+     * mtime for folders is only with a minute resolution
+     */
+    public function testStat(): void {
+        $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
+        $ctimeStart = time();
+        $this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile));
+        $this->assertTrue($this->instance->isReadable('/lorem.txt'));
+        $ctimeEnd = time();
+        $mTime = $this->instance->filemtime('/lorem.txt');
+        $this->assertTrue($this->instance->hasUpdated('/lorem.txt', $ctimeStart - 5));
+        $this->assertTrue($this->instance->hasUpdated('/', $ctimeStart - 61));
+
+        // check that ($ctimeStart - 5) <= $mTime <= ($ctimeEnd + 1)
+        $this->assertGreaterThanOrEqual(($ctimeStart - 5), $mTime);
+        $this->assertLessThanOrEqual(($ctimeEnd + 1), $mTime);
+        $this->assertEquals(filesize($textFile), $this->instance->filesize('/lorem.txt'));
+
+        $stat = $this->instance->stat('/lorem.txt');
+        //only size and mtime are required in the result
+        $this->assertEquals($stat['size'], $this->instance->filesize('/lorem.txt'));
+        $this->assertEquals($stat['mtime'], $mTime);
+
+        if ($this->instance->touch('/lorem.txt', 100) !== false) {
+            $mTime = $this->instance->filemtime('/lorem.txt');
+            $this->assertEquals($mTime, 100);
+        }
+
+        $mtimeStart = time();
+
+        $this->instance->unlink('/lorem.txt');
+        $this->assertTrue($this->instance->hasUpdated('/', $mtimeStart - 61));
+    }
 }

apps/files_external/tests/Storage/SftpTest.php

Indentation +110 added lines, -110 removed lines

@@ -18,121 +18,121 @@
  * @package OCA\Files_External\Tests\Storage
  */
 class SftpTest extends \Test\Files\Storage\Storage {
-	/**
-	 * @var SFTP instance
-	 */
-	protected $instance;
+    /**
+     * @var SFTP instance
+     */
+    protected $instance;
 
-	private $config;
+    private $config;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$id = $this->getUniqueID();
-		$this->config = include('files_external/tests/config.sftp.php');
-		if (!is_array($this->config) or !$this->config['run']) {
-			$this->markTestSkipped('SFTP backend not configured');
-		}
-		$this->config['root'] .= '/' . $id; //make sure we have an new empty folder to work in
-		$this->instance = new SFTP($this->config);
-		$this->instance->mkdir('/');
-	}
+        $id = $this->getUniqueID();
+        $this->config = include('files_external/tests/config.sftp.php');
+        if (!is_array($this->config) or !$this->config['run']) {
+            $this->markTestSkipped('SFTP backend not configured');
+        }
+        $this->config['root'] .= '/' . $id; //make sure we have an new empty folder to work in
+        $this->instance = new SFTP($this->config);
+        $this->instance->mkdir('/');
+    }
 
-	protected function tearDown(): void {
-		if ($this->instance) {
-			$this->instance->rmdir('/');
-		}
+    protected function tearDown(): void {
+        if ($this->instance) {
+            $this->instance->rmdir('/');
+        }
 
-		parent::tearDown();
-	}
+        parent::tearDown();
+    }
 
-	/**
-	 * @dataProvider configProvider
-	 */
-	public function testStorageId($config, $expectedStorageId): void {
-		$instance = new SFTP($config);
-		$this->assertEquals($expectedStorageId, $instance->getId());
-	}
+    /**
+     * @dataProvider configProvider
+     */
+    public function testStorageId($config, $expectedStorageId): void {
+        $instance = new SFTP($config);
+        $this->assertEquals($expectedStorageId, $instance->getId());
+    }
 
-	public static function configProvider(): array {
-		return [
-			[
-				// no root path
-				[
-					'run' => true,
-					'host' => 'somehost',
-					'user' => 'someuser',
-					'password' => 'somepassword',
-					'root' => '',
-				],
-				'sftp::someuser@somehost//',
-			],
-			[
-				// without leading nor trailing slash
-				[
-					'run' => true,
-					'host' => 'somehost',
-					'user' => 'someuser',
-					'password' => 'somepassword',
-					'root' => 'remotedir/subdir',
-				],
-				'sftp::someuser@somehost//remotedir/subdir/',
-			],
-			[
-				// regular path
-				[
-					'run' => true,
-					'host' => 'somehost',
-					'user' => 'someuser',
-					'password' => 'somepassword',
-					'root' => '/remotedir/subdir/',
-				],
-				'sftp::someuser@somehost//remotedir/subdir/',
-			],
-			[
-				// different port
-				[
-					'run' => true,
-					'host' => 'somehost:8822',
-					'user' => 'someuser',
-					'password' => 'somepassword',
-					'root' => 'remotedir/subdir/',
-				],
-				'sftp::someuser@somehost:8822//remotedir/subdir/',
-			],
-			[
-				// ipv6 with port
-				[
-					'run' => true,
-					'host' => 'FE80:0000:0000:0000:0202:B3FF:FE1E:8329',
-					'user' => 'someuser',
-					'password' => 'somepassword',
-					'root' => 'remotedir/subdir/',
-				],
-				'sftp::someuser@FE80:0000:0000:0000:0202:B3FF:FE1E:8329//remotedir/subdir/',
-			],
-			[
-				// ipv6 without port
-				[
-					'run' => true,
-					'host' => 'FE80:0000:0000:0000:0202:B3FF:FE1E:8329:8822',
-					'user' => 'someuser',
-					'password' => 'somepassword',
-					'root' => 'remotedir/subdir/',
-				],
-				'sftp::someuser@FE80:0000:0000:0000:0202:B3FF:FE1E:8329:8822//remotedir/subdir/',
-			],
-			[
-				// collapsed ipv6 with port
-				[
-					'run' => true,
-					'host' => 'FE80::0202:B3FF:FE1E:8329:8822',
-					'user' => 'someuser',
-					'password' => 'somepassword',
-					'root' => 'remotedir/subdir/',
-				],
-				'sftp::someuser@FE80::0202:B3FF:FE1E:8329:8822//remotedir/subdir/',
-			],
-		];
-	}
+    public static function configProvider(): array {
+        return [
+            [
+                // no root path
+                [
+                    'run' => true,
+                    'host' => 'somehost',
+                    'user' => 'someuser',
+                    'password' => 'somepassword',
+                    'root' => '',
+                ],
+                'sftp::someuser@somehost//',
+            ],
+            [
+                // without leading nor trailing slash
+                [
+                    'run' => true,
+                    'host' => 'somehost',
+                    'user' => 'someuser',
+                    'password' => 'somepassword',
+                    'root' => 'remotedir/subdir',
+                ],
+                'sftp::someuser@somehost//remotedir/subdir/',
+            ],
+            [
+                // regular path
+                [
+                    'run' => true,
+                    'host' => 'somehost',
+                    'user' => 'someuser',
+                    'password' => 'somepassword',
+                    'root' => '/remotedir/subdir/',
+                ],
+                'sftp::someuser@somehost//remotedir/subdir/',
+            ],
+            [
+                // different port
+                [
+                    'run' => true,
+                    'host' => 'somehost:8822',
+                    'user' => 'someuser',
+                    'password' => 'somepassword',
+                    'root' => 'remotedir/subdir/',
+                ],
+                'sftp::someuser@somehost:8822//remotedir/subdir/',
+            ],
+            [
+                // ipv6 with port
+                [
+                    'run' => true,
+                    'host' => 'FE80:0000:0000:0000:0202:B3FF:FE1E:8329',
+                    'user' => 'someuser',
+                    'password' => 'somepassword',
+                    'root' => 'remotedir/subdir/',
+                ],
+                'sftp::someuser@FE80:0000:0000:0000:0202:B3FF:FE1E:8329//remotedir/subdir/',
+            ],
+            [
+                // ipv6 without port
+                [
+                    'run' => true,
+                    'host' => 'FE80:0000:0000:0000:0202:B3FF:FE1E:8329:8822',
+                    'user' => 'someuser',
+                    'password' => 'somepassword',
+                    'root' => 'remotedir/subdir/',
+                ],
+                'sftp::someuser@FE80:0000:0000:0000:0202:B3FF:FE1E:8329:8822//remotedir/subdir/',
+            ],
+            [
+                // collapsed ipv6 with port
+                [
+                    'run' => true,
+                    'host' => 'FE80::0202:B3FF:FE1E:8329:8822',
+                    'user' => 'someuser',
+                    'password' => 'somepassword',
+                    'root' => 'remotedir/subdir/',
+                ],
+                'sftp::someuser@FE80::0202:B3FF:FE1E:8329:8822//remotedir/subdir/',
+            ],
+        ];
+    }
 }

apps/files_external/tests/Command/ApplicableTest.php

Indentation +103 added lines, -103 removed lines

@@ -14,145 +14,145 @@
 use PHPUnit\Framework\MockObject\MockObject;
 
 class ApplicableTest extends CommandTestCase {
-	private function getInstance($storageService): Applicable {
-		/** @var IUserManager&MockObject $userManager */
-		$userManager = $this->createMock(IUserManager::class);
-		/** @var IGroupManager&MockObject $groupManager */
-		$groupManager = $this->createMock(IGroupManager::class);
+    private function getInstance($storageService): Applicable {
+        /** @var IUserManager&MockObject $userManager */
+        $userManager = $this->createMock(IUserManager::class);
+        /** @var IGroupManager&MockObject $groupManager */
+        $groupManager = $this->createMock(IGroupManager::class);
 
-		$userManager->expects($this->any())
-			->method('userExists')
-			->willReturn(true);
+        $userManager->expects($this->any())
+            ->method('userExists')
+            ->willReturn(true);
 
-		$groupManager->expects($this->any())
-			->method('groupExists')
-			->willReturn(true);
+        $groupManager->expects($this->any())
+            ->method('groupExists')
+            ->willReturn(true);
 
-		return new Applicable($storageService, $userManager, $groupManager);
-	}
+        return new Applicable($storageService, $userManager, $groupManager);
+    }
 
-	public function testListEmpty(): void {
-		$mount = $this->getMount(1, '', '');
+    public function testListEmpty(): void {
+        $mount = $this->getMount(1, '', '');
 
-		$storageService = $this->getGlobalStorageService([$mount]);
-		$command = $this->getInstance($storageService);
+        $storageService = $this->getGlobalStorageService([$mount]);
+        $command = $this->getInstance($storageService);
 
-		$input = $this->getInput($command, [
-			'mount_id' => 1
-		], [
-			'output' => 'json'
-		]);
+        $input = $this->getInput($command, [
+            'mount_id' => 1
+        ], [
+            'output' => 'json'
+        ]);
 
-		$result = json_decode($this->executeCommand($command, $input), true);
+        $result = json_decode($this->executeCommand($command, $input), true);
 
-		$this->assertEquals(['users' => [], 'groups' => []], $result);
-	}
+        $this->assertEquals(['users' => [], 'groups' => []], $result);
+    }
 
-	public function testList(): void {
-		$mount = $this->getMount(1, '', '', '', [], [], ['test', 'asd']);
+    public function testList(): void {
+        $mount = $this->getMount(1, '', '', '', [], [], ['test', 'asd']);
 
-		$storageService = $this->getGlobalStorageService([$mount]);
-		$command = $this->getInstance($storageService);
+        $storageService = $this->getGlobalStorageService([$mount]);
+        $command = $this->getInstance($storageService);
 
-		$input = $this->getInput($command, [
-			'mount_id' => 1
-		], [
-			'output' => 'json'
-		]);
+        $input = $this->getInput($command, [
+            'mount_id' => 1
+        ], [
+            'output' => 'json'
+        ]);
 
-		$result = json_decode($this->executeCommand($command, $input), true);
+        $result = json_decode($this->executeCommand($command, $input), true);
 
-		$this->assertEquals(['users' => ['test', 'asd'], 'groups' => []], $result);
-	}
+        $this->assertEquals(['users' => ['test', 'asd'], 'groups' => []], $result);
+    }
 
-	public function testAddSingle(): void {
-		$mount = $this->getMount(1, '', '', '', [], [], []);
+    public function testAddSingle(): void {
+        $mount = $this->getMount(1, '', '', '', [], [], []);
 
-		$storageService = $this->getGlobalStorageService([$mount]);
-		$command = $this->getInstance($storageService);
+        $storageService = $this->getGlobalStorageService([$mount]);
+        $command = $this->getInstance($storageService);
 
-		$input = $this->getInput($command, [
-			'mount_id' => 1
-		], [
-			'output' => 'json',
-			'add-user' => ['foo']
-		]);
+        $input = $this->getInput($command, [
+            'mount_id' => 1
+        ], [
+            'output' => 'json',
+            'add-user' => ['foo']
+        ]);
 
-		$this->executeCommand($command, $input);
+        $this->executeCommand($command, $input);
 
-		$this->assertEquals(['foo'], $mount->getApplicableUsers());
-	}
+        $this->assertEquals(['foo'], $mount->getApplicableUsers());
+    }
 
-	public function testAddDuplicate(): void {
-		$mount = $this->getMount(1, '', '', '', [], [], ['foo']);
+    public function testAddDuplicate(): void {
+        $mount = $this->getMount(1, '', '', '', [], [], ['foo']);
 
-		$storageService = $this->getGlobalStorageService([$mount]);
-		$command = $this->getInstance($storageService);
+        $storageService = $this->getGlobalStorageService([$mount]);
+        $command = $this->getInstance($storageService);
 
-		$input = $this->getInput($command, [
-			'mount_id' => 1
-		], [
-			'output' => 'json',
-			'add-user' => ['foo', 'bar']
-		]);
+        $input = $this->getInput($command, [
+            'mount_id' => 1
+        ], [
+            'output' => 'json',
+            'add-user' => ['foo', 'bar']
+        ]);
 
-		$this->executeCommand($command, $input);
+        $this->executeCommand($command, $input);
 
-		$this->assertEquals(['foo', 'bar'], $mount->getApplicableUsers());
-	}
+        $this->assertEquals(['foo', 'bar'], $mount->getApplicableUsers());
+    }
 
-	public function testRemoveSingle(): void {
-		$mount = $this->getMount(1, '', '', '', [], [], ['foo', 'bar']);
+    public function testRemoveSingle(): void {
+        $mount = $this->getMount(1, '', '', '', [], [], ['foo', 'bar']);
 
-		$storageService = $this->getGlobalStorageService([$mount]);
-		$command = $this->getInstance($storageService);
+        $storageService = $this->getGlobalStorageService([$mount]);
+        $command = $this->getInstance($storageService);
 
-		$input = $this->getInput($command, [
-			'mount_id' => 1
-		], [
-			'output' => 'json',
-			'remove-user' => ['bar']
-		]);
+        $input = $this->getInput($command, [
+            'mount_id' => 1
+        ], [
+            'output' => 'json',
+            'remove-user' => ['bar']
+        ]);
 
-		$this->executeCommand($command, $input);
+        $this->executeCommand($command, $input);
 
-		$this->assertEquals(['foo'], $mount->getApplicableUsers());
-	}
+        $this->assertEquals(['foo'], $mount->getApplicableUsers());
+    }
 
-	public function testRemoveNonExisting(): void {
-		$mount = $this->getMount(1, '', '', '', [], [], ['foo', 'bar']);
+    public function testRemoveNonExisting(): void {
+        $mount = $this->getMount(1, '', '', '', [], [], ['foo', 'bar']);
 
-		$storageService = $this->getGlobalStorageService([$mount]);
-		$command = $this->getInstance($storageService);
+        $storageService = $this->getGlobalStorageService([$mount]);
+        $command = $this->getInstance($storageService);
 
-		$input = $this->getInput($command, [
-			'mount_id' => 1
-		], [
-			'output' => 'json',
-			'remove-user' => ['bar', 'asd']
-		]);
+        $input = $this->getInput($command, [
+            'mount_id' => 1
+        ], [
+            'output' => 'json',
+            'remove-user' => ['bar', 'asd']
+        ]);
 
-		$this->executeCommand($command, $input);
+        $this->executeCommand($command, $input);
 
-		$this->assertEquals(['foo'], $mount->getApplicableUsers());
-	}
+        $this->assertEquals(['foo'], $mount->getApplicableUsers());
+    }
 
-	public function testRemoveAddRemove(): void {
-		$mount = $this->getMount(1, '', '', '', [], [], ['foo', 'bar']);
+    public function testRemoveAddRemove(): void {
+        $mount = $this->getMount(1, '', '', '', [], [], ['foo', 'bar']);
 
-		$storageService = $this->getGlobalStorageService([$mount]);
-		$command = $this->getInstance($storageService);
+        $storageService = $this->getGlobalStorageService([$mount]);
+        $command = $this->getInstance($storageService);
 
-		$input = $this->getInput($command, [
-			'mount_id' => 1
-		], [
-			'output' => 'json',
-			'remove-user' => ['bar', 'asd'],
-			'add-user' => ['test']
-		]);
+        $input = $this->getInput($command, [
+            'mount_id' => 1
+        ], [
+            'output' => 'json',
+            'remove-user' => ['bar', 'asd'],
+            'add-user' => ['test']
+        ]);
 
-		$this->executeCommand($command, $input);
+        $this->executeCommand($command, $input);
 
-		$this->assertEquals(['foo', 'test'], $mount->getApplicableUsers());
-	}
+        $this->assertEquals(['foo', 'test'], $mount->getApplicableUsers());
+    }
 }

apps/files_external/tests/Command/ListCommandTest.php

Indentation +29 added lines, -29 removed lines

@@ -24,37 +24,37 @@
 use Symfony\Component\Console\Output\BufferedOutput;
 
 class ListCommandTest extends CommandTestCase {
-	private function getInstance(): ListCommand {
-		/** @var GlobalStoragesService&MockObject $globalService */
-		$globalService = $this->createMock(GlobalStoragesService::class);
-		/** @var UserStoragesService&MockObject $userService */
-		$userService = $this->createMock(UserStoragesService::class);
-		/** @var IUserManager&MockObject $userManager */
-		$userManager = $this->createMock(IUserManager::class);
-		/** @var IUserSession&MockObject $userSession */
-		$userSession = $this->createMock(IUserSession::class);
+    private function getInstance(): ListCommand {
+        /** @var GlobalStoragesService&MockObject $globalService */
+        $globalService = $this->createMock(GlobalStoragesService::class);
+        /** @var UserStoragesService&MockObject $userService */
+        $userService = $this->createMock(UserStoragesService::class);
+        /** @var IUserManager&MockObject $userManager */
+        $userManager = $this->createMock(IUserManager::class);
+        /** @var IUserSession&MockObject $userSession */
+        $userSession = $this->createMock(IUserSession::class);
 
-		return new ListCommand($globalService, $userService, $userSession, $userManager);
-	}
+        return new ListCommand($globalService, $userService, $userSession, $userManager);
+    }
 
-	public function testListAuthIdentifier(): void {
-		$l10n = $this->createMock(IL10N::class);
-		$instance = $this->getInstance();
-		$mount1 = new StorageConfig();
-		$mount1->setAuthMechanism(new Password($l10n));
-		$mount1->setBackend(new Local($l10n, new NullMechanism($l10n)));
-		$mount2 = new StorageConfig();
-		$credentialStore = $this->createMock(IStore::class);
-		$mount2->setAuthMechanism(new SessionCredentials($l10n, $credentialStore));
-		$mount2->setBackend(new Local($l10n, new NullMechanism($l10n)));
-		$input = $this->getInput($instance, [], [
-			'output' => 'json'
-		]);
-		$output = new BufferedOutput();
+    public function testListAuthIdentifier(): void {
+        $l10n = $this->createMock(IL10N::class);
+        $instance = $this->getInstance();
+        $mount1 = new StorageConfig();
+        $mount1->setAuthMechanism(new Password($l10n));
+        $mount1->setBackend(new Local($l10n, new NullMechanism($l10n)));
+        $mount2 = new StorageConfig();
+        $credentialStore = $this->createMock(IStore::class);
+        $mount2->setAuthMechanism(new SessionCredentials($l10n, $credentialStore));
+        $mount2->setBackend(new Local($l10n, new NullMechanism($l10n)));
+        $input = $this->getInput($instance, [], [
+            'output' => 'json'
+        ]);
+        $output = new BufferedOutput();
 
-		$instance->listMounts('', [$mount1, $mount2], $input, $output);
-		$output = json_decode($output->fetch(), true);
+        $instance->listMounts('', [$mount1, $mount2], $input, $output);
+        $output = json_decode($output->fetch(), true);
 
-		$this->assertNotEquals($output[0]['authentication_type'], $output[1]['authentication_type']);
-	}
+        $this->assertNotEquals($output[0]['authentication_type'], $output[1]['authentication_type']);
+    }
 }

apps/files_external/tests/Config/UserPlaceholderHandlerTest.php

Indentation +46 added lines, -46 removed lines

@@ -17,57 +17,57 @@
 use PHPUnit\Framework\MockObject\MockObject;
 
 class UserPlaceholderHandlerTest extends \Test\TestCase {
-	protected IUser&MockObject $user;
-	protected IUserSession&MockObject $session;
-	protected IManager&MockObject $shareManager;
-	protected IRequest&MockObject $request;
-	protected IUserManager&MockObject $userManager;
-	protected UserPlaceholderHandler $handler;
+    protected IUser&MockObject $user;
+    protected IUserSession&MockObject $session;
+    protected IManager&MockObject $shareManager;
+    protected IRequest&MockObject $request;
+    protected IUserManager&MockObject $userManager;
+    protected UserPlaceholderHandler $handler;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->user = $this->createMock(IUser::class);
-		$this->user->expects($this->any())
-			->method('getUid')
-			->willReturn('alice');
-		$this->session = $this->createMock(IUserSession::class);
-		$this->shareManager = $this->createMock(IManager::class);
-		$this->request = $this->createMock(IRequest::class);
-		$this->userManager = $this->createMock(IUserManager::class);
+        $this->user = $this->createMock(IUser::class);
+        $this->user->expects($this->any())
+            ->method('getUid')
+            ->willReturn('alice');
+        $this->session = $this->createMock(IUserSession::class);
+        $this->shareManager = $this->createMock(IManager::class);
+        $this->request = $this->createMock(IRequest::class);
+        $this->userManager = $this->createMock(IUserManager::class);
 
-		$this->handler = new UserPlaceholderHandler($this->session, $this->shareManager, $this->request, $this->userManager);
-	}
+        $this->handler = new UserPlaceholderHandler($this->session, $this->shareManager, $this->request, $this->userManager);
+    }
 
-	protected function setUser(): void {
-		$this->session->expects($this->any())
-			->method('getUser')
-			->willReturn($this->user);
-	}
+    protected function setUser(): void {
+        $this->session->expects($this->any())
+            ->method('getUser')
+            ->willReturn($this->user);
+    }
 
-	public static function optionProvider(): array {
-		return [
-			['/foo/bar/$user/foobar', '/foo/bar/alice/foobar'],
-			[['/foo/bar/$user/foobar'], ['/foo/bar/alice/foobar']],
-			[['/FOO/BAR/$USER/FOOBAR'], ['/FOO/BAR/alice/FOOBAR']],
-		];
-	}
+    public static function optionProvider(): array {
+        return [
+            ['/foo/bar/$user/foobar', '/foo/bar/alice/foobar'],
+            [['/foo/bar/$user/foobar'], ['/foo/bar/alice/foobar']],
+            [['/FOO/BAR/$USER/FOOBAR'], ['/FOO/BAR/alice/FOOBAR']],
+        ];
+    }
 
-	/**
-	 * @dataProvider optionProvider
-	 */
-	public function testHandle(string|array $option, string|array $expected): void {
-		$this->setUser();
-		$this->assertSame($expected, $this->handler->handle($option));
-	}
+    /**
+     * @dataProvider optionProvider
+     */
+    public function testHandle(string|array $option, string|array $expected): void {
+        $this->setUser();
+        $this->assertSame($expected, $this->handler->handle($option));
+    }
 
-	/**
-	 * @dataProvider optionProvider
-	 */
-	public function testHandleNoUser(string|array $option): void {
-		$this->shareManager->expects($this->once())
-			->method('getShareByToken')
-			->willThrowException(new ShareNotFound());
-		$this->assertSame($option, $this->handler->handle($option));
-	}
+    /**
+     * @dataProvider optionProvider
+     */
+    public function testHandleNoUser(string|array $option): void {
+        $this->shareManager->expects($this->once())
+            ->method('getShareByToken')
+            ->willThrowException(new ShareNotFound());
+        $this->assertSame($option, $this->handler->handle($option));
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 	/**
 	 * @dataProvider optionProvider
 	 */
-	public function testHandle(string|array $option, string|array $expected): void {
+	public function testHandle(string | array $option, string | array $expected): void {
 		$this->setUser();
 		$this->assertSame($expected, $this->handler->handle($option));
 	}
@@ -64,7 +64,7 @@ 
 	/**
 	 * @dataProvider optionProvider
 	 */
-	public function testHandleNoUser(string|array $option): void {
+	public function testHandleNoUser(string | array $option): void {
 		$this->shareManager->expects($this->once())
 			->method('getShareByToken')
 			->willThrowException(new ShareNotFound());

apps/files_external/tests/PersonalMountTest.php

Indentation +13 added lines, -13 removed lines

@@ -17,22 +17,22 @@
 use Test\TestCase;
 
 class PersonalMountTest extends TestCase {
-	public function testFindByStorageId(): void {
-		$storageConfig = $this->createMock(StorageConfig::class);
-		/** @var UserStoragesService $storageService */
-		$storageService = $this->createMock(UserStoragesService::class);
+    public function testFindByStorageId(): void {
+        $storageConfig = $this->createMock(StorageConfig::class);
+        /** @var UserStoragesService $storageService */
+        $storageService = $this->createMock(UserStoragesService::class);
 
-		$storage = $this->createMock(Storage::class);
+        $storage = $this->createMock(Storage::class);
 
-		$storage->expects($this->any())
-			->method('getId')
-			->willReturn('dummy');
+        $storage->expects($this->any())
+            ->method('getId')
+            ->willReturn('dummy');
 
-		$mount = new PersonalMount($storageService, $storageConfig, 10, $storage, '/foo');
+        $mount = new PersonalMount($storageService, $storageConfig, 10, $storage, '/foo');
 
-		$mountManager = new Manager($this->createMock(SetupManagerFactory::class));
-		$mountManager->addMount($mount);
+        $mountManager = new Manager($this->createMock(SetupManagerFactory::class));
+        $mountManager->addMount($mount);
 
-		$this->assertEquals([$mount], $mountManager->findByStorageId('dummy'));
-	}
+        $this->assertEquals([$mount], $mountManager->findByStorageId('dummy'));
+    }
 }