nextcloud / server

tests/lib/OCS/DiscoveryServiceTest.php

Indentation +55 added lines, -55 removed lines

@@ -13,68 +13,68 @@
 use Test\TestCase;
 
 class DiscoveryServiceTest extends TestCase {
-	/** @var \PHPUnit\Framework\MockObject\MockObject | ICacheFactory */
-	private $cacheFactory;
+    /** @var \PHPUnit\Framework\MockObject\MockObject | ICacheFactory */
+    private $cacheFactory;
 
-	/** @var \PHPUnit\Framework\MockObject\MockObject | IClientService */
-	private $clientService;
+    /** @var \PHPUnit\Framework\MockObject\MockObject | IClientService */
+    private $clientService;
 
-	/** @var IDiscoveryService */
-	private $discoveryService;
+    /** @var IDiscoveryService */
+    private $discoveryService;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->cacheFactory = $this->getMockBuilder(ICacheFactory::class)->getMock();
-		$this->clientService = $this->getMockBuilder(IClientService::class)->getMock();
+        $this->cacheFactory = $this->getMockBuilder(ICacheFactory::class)->getMock();
+        $this->clientService = $this->getMockBuilder(IClientService::class)->getMock();
 
-		$this->discoveryService = new DiscoveryService(
-			$this->cacheFactory,
-			$this->clientService
-		);
-	}
+        $this->discoveryService = new DiscoveryService(
+            $this->cacheFactory,
+            $this->clientService
+        );
+    }
 
-	/**
-	 * @dataProvider dataTestIsSafeUrl
-	 *
-	 * @param string $url
-	 * @param bool $expected
-	 */
-	public function testIsSafeUrl($url, $expected): void {
-		$result = $this->invokePrivate($this->discoveryService, 'isSafeUrl', [$url]);
-		$this->assertSame($expected, $result);
-	}
+    /**
+     * @dataProvider dataTestIsSafeUrl
+     *
+     * @param string $url
+     * @param bool $expected
+     */
+    public function testIsSafeUrl($url, $expected): void {
+        $result = $this->invokePrivate($this->discoveryService, 'isSafeUrl', [$url]);
+        $this->assertSame($expected, $result);
+    }
 
-	public static function dataTestIsSafeUrl(): array {
-		return [
-			['api/ocs/v1.php/foo', true],
-			['/api/ocs/v1.php/foo', true],
-			['api/ocs/v1.php/foo/', true],
-			['api/ocs/v1.php/foo-bar/', true],
-			['api/ocs/v1:php/foo', false],
-			['api/ocs/<v1.php/foo', false],
-			['api/ocs/v1.php>/foo', false],
-		];
-	}
+    public static function dataTestIsSafeUrl(): array {
+        return [
+            ['api/ocs/v1.php/foo', true],
+            ['/api/ocs/v1.php/foo', true],
+            ['api/ocs/v1.php/foo/', true],
+            ['api/ocs/v1.php/foo-bar/', true],
+            ['api/ocs/v1:php/foo', false],
+            ['api/ocs/<v1.php/foo', false],
+            ['api/ocs/v1.php>/foo', false],
+        ];
+    }
 
-	/**
-	 * @dataProvider dataTestGetEndpoints
-	 *
-	 * @param array $decodedServices
-	 * @param string $service
-	 * @param array $expected
-	 */
-	public function testGetEndpoints($decodedServices, $service, $expected): void {
-		$result = $this->invokePrivate($this->discoveryService, 'getEndpoints', [$decodedServices, $service]);
-		$this->assertSame($expected, $result);
-	}
+    /**
+     * @dataProvider dataTestGetEndpoints
+     *
+     * @param array $decodedServices
+     * @param string $service
+     * @param array $expected
+     */
+    public function testGetEndpoints($decodedServices, $service, $expected): void {
+        $result = $this->invokePrivate($this->discoveryService, 'getEndpoints', [$decodedServices, $service]);
+        $this->assertSame($expected, $result);
+    }
 
-	public static function dataTestGetEndpoints(): array {
-		return [
-			[['services' => ['myService' => ['endpoints' => []]]], 'myService', []],
-			[['services' => ['myService' => ['endpoints' => ['foo' => '/bar']]]], 'myService', ['foo' => '/bar']],
-			[['services' => ['myService' => ['endpoints' => ['foo' => '/bar']]]], 'anotherService', []],
-			[['services' => ['myService' => ['endpoints' => ['foo' => '/bar</foo']]]], 'myService', []],
-		];
-	}
+    public static function dataTestGetEndpoints(): array {
+        return [
+            [['services' => ['myService' => ['endpoints' => []]]], 'myService', []],
+            [['services' => ['myService' => ['endpoints' => ['foo' => '/bar']]]], 'myService', ['foo' => '/bar']],
+            [['services' => ['myService' => ['endpoints' => ['foo' => '/bar']]]], 'anotherService', []],
+            [['services' => ['myService' => ['endpoints' => ['foo' => '/bar</foo']]]], 'myService', []],
+        ];
+    }
 }

tests/lib/OCS/ApiHelperTest.php

Indentation +34 added lines, -34 removed lines

@@ -14,38 +14,38 @@
 use OCP\IRequest;
 
 class ApiHelperTest extends \Test\TestCase {
-	public static function versionDataScriptNameProvider(): array {
-		return [
-			// Valid script name
-			[
-				'/master/ocs/v2.php', true,
-			],
-
-			// Invalid script names
-			[
-				'/master/ocs/v2.php/someInvalidPathName', false,
-			],
-			[
-				'/master/ocs/v1.php', false,
-			],
-			[
-				'', false,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider versionDataScriptNameProvider
-	 */
-	public function testIsV2(string $scriptName, bool $expected): void {
-		$request = $this->getMockBuilder(IRequest::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$request
-			->expects($this->once())
-			->method('getScriptName')
-			->willReturn($scriptName);
-
-		$this->assertEquals($expected, $this->invokePrivate(new ApiHelper, 'isV2', [$request]));
-	}
+    public static function versionDataScriptNameProvider(): array {
+        return [
+            // Valid script name
+            [
+                '/master/ocs/v2.php', true,
+            ],
+
+            // Invalid script names
+            [
+                '/master/ocs/v2.php/someInvalidPathName', false,
+            ],
+            [
+                '/master/ocs/v1.php', false,
+            ],
+            [
+                '', false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider versionDataScriptNameProvider
+     */
+    public function testIsV2(string $scriptName, bool $expected): void {
+        $request = $this->getMockBuilder(IRequest::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $request
+            ->expects($this->once())
+            ->method('getScriptName')
+            ->willReturn($scriptName);
+
+        $this->assertEquals($expected, $this->invokePrivate(new ApiHelper, 'isV2', [$request]));
+    }
 }

tests/lib/InfoXmlTest.php

Indentation +114 added lines, -114 removed lines

@@ -16,118 +16,118 @@
  * @package Test
  */
 class InfoXmlTest extends TestCase {
-	private IAppManager $appManager;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->appManager = Server::get(IAppManager::class);
-	}
-
-	public static function dataApps(): array {
-		return [
-			['admin_audit'],
-			['comments'],
-			['dav'],
-			['encryption'],
-			['federatedfilesharing'],
-			['federation'],
-			['files'],
-			['files_external'],
-			['files_sharing'],
-			['files_trashbin'],
-			['files_versions'],
-			['provisioning_api'],
-			['systemtags'],
-			['theming'],
-			['settings'],
-			['twofactor_backupcodes'],
-			['updatenotification'],
-			['user_ldap'],
-			['workflowengine'],
-		];
-	}
-
-	/**
-	 * @dataProvider dataApps
-	 *
-	 * @param string $app
-	 */
-	public function testClasses($app): void {
-		$appInfo = $this->appManager->getAppInfo($app);
-		$appPath = $this->appManager->getAppPath($app);
-		\OC_App::registerAutoloading($app, $appPath);
-
-		//Add the appcontainer
-		$applicationClassName = \OCP\AppFramework\App::buildAppNamespace($app) . '\\AppInfo\\Application';
-		if (class_exists($applicationClassName)) {
-			$application = new $applicationClassName();
-			$this->addToAssertionCount(1);
-		} else {
-			$application = new \OCP\AppFramework\App($app);
-			$this->addToAssertionCount(1);
-		}
-
-		if (isset($appInfo['background-jobs'])) {
-			foreach ($appInfo['background-jobs'] as $job) {
-				$this->assertTrue(class_exists($job), 'Asserting background job "' . $job . '" exists');
-				$this->assertInstanceOf($job, \OC::$server->query($job));
-			}
-		}
-
-		if (isset($appInfo['two-factor-providers'])) {
-			foreach ($appInfo['two-factor-providers'] as $provider) {
-				$this->assertTrue(class_exists($provider), 'Asserting two-factor providers "' . $provider . '" exists');
-				$this->assertInstanceOf($provider, \OC::$server->query($provider));
-			}
-		}
-
-		if (isset($appInfo['commands'])) {
-			foreach ($appInfo['commands'] as $command) {
-				$this->assertTrue(class_exists($command), 'Asserting command "' . $command . '" exists');
-				$this->assertInstanceOf($command, \OC::$server->query($command));
-			}
-		}
-
-		if (isset($appInfo['repair-steps']['pre-migration'])) {
-			foreach ($appInfo['repair-steps']['pre-migration'] as $migration) {
-				$this->assertTrue(class_exists($migration), 'Asserting pre-migration "' . $migration . '" exists');
-				$this->assertInstanceOf($migration, \OC::$server->query($migration));
-			}
-		}
-
-		if (isset($appInfo['repair-steps']['post-migration'])) {
-			foreach ($appInfo['repair-steps']['post-migration'] as $migration) {
-				$this->assertTrue(class_exists($migration), 'Asserting post-migration "' . $migration . '" exists');
-				$this->assertInstanceOf($migration, \OC::$server->query($migration));
-			}
-		}
-
-		if (isset($appInfo['repair-steps']['live-migration'])) {
-			foreach ($appInfo['repair-steps']['live-migration'] as $migration) {
-				$this->assertTrue(class_exists($migration), 'Asserting live-migration "' . $migration . '" exists');
-				$this->assertInstanceOf($migration, \OC::$server->query($migration));
-			}
-		}
-
-		if (isset($appInfo['repair-steps']['install'])) {
-			foreach ($appInfo['repair-steps']['install'] as $migration) {
-				$this->assertTrue(class_exists($migration), 'Asserting install-migration "' . $migration . '" exists');
-				$this->assertInstanceOf($migration, \OC::$server->query($migration));
-			}
-		}
-
-		if (isset($appInfo['repair-steps']['uninstall'])) {
-			foreach ($appInfo['repair-steps']['uninstall'] as $migration) {
-				$this->assertTrue(class_exists($migration), 'Asserting uninstall-migration "' . $migration . '" exists');
-				$this->assertInstanceOf($migration, \OC::$server->query($migration));
-			}
-		}
-
-		if (isset($appInfo['commands'])) {
-			foreach ($appInfo['commands'] as $command) {
-				$this->assertTrue(class_exists($command), 'Asserting command "' . $command . '"exists');
-				$this->assertInstanceOf($command, \OC::$server->query($command));
-			}
-		}
-	}
+    private IAppManager $appManager;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->appManager = Server::get(IAppManager::class);
+    }
+
+    public static function dataApps(): array {
+        return [
+            ['admin_audit'],
+            ['comments'],
+            ['dav'],
+            ['encryption'],
+            ['federatedfilesharing'],
+            ['federation'],
+            ['files'],
+            ['files_external'],
+            ['files_sharing'],
+            ['files_trashbin'],
+            ['files_versions'],
+            ['provisioning_api'],
+            ['systemtags'],
+            ['theming'],
+            ['settings'],
+            ['twofactor_backupcodes'],
+            ['updatenotification'],
+            ['user_ldap'],
+            ['workflowengine'],
+        ];
+    }
+
+    /**
+     * @dataProvider dataApps
+     *
+     * @param string $app
+     */
+    public function testClasses($app): void {
+        $appInfo = $this->appManager->getAppInfo($app);
+        $appPath = $this->appManager->getAppPath($app);
+        \OC_App::registerAutoloading($app, $appPath);
+
+        //Add the appcontainer
+        $applicationClassName = \OCP\AppFramework\App::buildAppNamespace($app) . '\\AppInfo\\Application';
+        if (class_exists($applicationClassName)) {
+            $application = new $applicationClassName();
+            $this->addToAssertionCount(1);
+        } else {
+            $application = new \OCP\AppFramework\App($app);
+            $this->addToAssertionCount(1);
+        }
+
+        if (isset($appInfo['background-jobs'])) {
+            foreach ($appInfo['background-jobs'] as $job) {
+                $this->assertTrue(class_exists($job), 'Asserting background job "' . $job . '" exists');
+                $this->assertInstanceOf($job, \OC::$server->query($job));
+            }
+        }
+
+        if (isset($appInfo['two-factor-providers'])) {
+            foreach ($appInfo['two-factor-providers'] as $provider) {
+                $this->assertTrue(class_exists($provider), 'Asserting two-factor providers "' . $provider . '" exists');
+                $this->assertInstanceOf($provider, \OC::$server->query($provider));
+            }
+        }
+
+        if (isset($appInfo['commands'])) {
+            foreach ($appInfo['commands'] as $command) {
+                $this->assertTrue(class_exists($command), 'Asserting command "' . $command . '" exists');
+                $this->assertInstanceOf($command, \OC::$server->query($command));
+            }
+        }
+
+        if (isset($appInfo['repair-steps']['pre-migration'])) {
+            foreach ($appInfo['repair-steps']['pre-migration'] as $migration) {
+                $this->assertTrue(class_exists($migration), 'Asserting pre-migration "' . $migration . '" exists');
+                $this->assertInstanceOf($migration, \OC::$server->query($migration));
+            }
+        }
+
+        if (isset($appInfo['repair-steps']['post-migration'])) {
+            foreach ($appInfo['repair-steps']['post-migration'] as $migration) {
+                $this->assertTrue(class_exists($migration), 'Asserting post-migration "' . $migration . '" exists');
+                $this->assertInstanceOf($migration, \OC::$server->query($migration));
+            }
+        }
+
+        if (isset($appInfo['repair-steps']['live-migration'])) {
+            foreach ($appInfo['repair-steps']['live-migration'] as $migration) {
+                $this->assertTrue(class_exists($migration), 'Asserting live-migration "' . $migration . '" exists');
+                $this->assertInstanceOf($migration, \OC::$server->query($migration));
+            }
+        }
+
+        if (isset($appInfo['repair-steps']['install'])) {
+            foreach ($appInfo['repair-steps']['install'] as $migration) {
+                $this->assertTrue(class_exists($migration), 'Asserting install-migration "' . $migration . '" exists');
+                $this->assertInstanceOf($migration, \OC::$server->query($migration));
+            }
+        }
+
+        if (isset($appInfo['repair-steps']['uninstall'])) {
+            foreach ($appInfo['repair-steps']['uninstall'] as $migration) {
+                $this->assertTrue(class_exists($migration), 'Asserting uninstall-migration "' . $migration . '" exists');
+                $this->assertInstanceOf($migration, \OC::$server->query($migration));
+            }
+        }
+
+        if (isset($appInfo['commands'])) {
+            foreach ($appInfo['commands'] as $command) {
+                $this->assertTrue(class_exists($command), 'Asserting command "' . $command . '"exists');
+                $this->assertInstanceOf($command, \OC::$server->query($command));
+            }
+        }
+    }
 }

tests/lib/LargeFileHelperGetFileSizeTest.php

Indentation +62 added lines, -62 removed lines

@@ -14,72 +14,72 @@
  * Large files are not considered yet.
  */
 class LargeFileHelperGetFileSizeTest extends TestCase {
-	/** @var string */
-	protected $filename;
-	/** @var int */
-	protected $fileSize;
-	/** @var \OC\LargeFileHelper */
-	protected $helper;
+    /** @var string */
+    protected $filename;
+    /** @var int */
+    protected $fileSize;
+    /** @var \OC\LargeFileHelper */
+    protected $helper;
 
-	protected function setUp(): void {
-		parent::setUp();
-		$this->helper = new \OC\LargeFileHelper();
-	}
+    protected function setUp(): void {
+        parent::setUp();
+        $this->helper = new \OC\LargeFileHelper();
+    }
 
-	public static function dataFileNameProvider(): array {
-		$path = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR;
+    public static function dataFileNameProvider(): array {
+        $path = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR;
 
-		return [
-			[ $path . 'lorem.txt', 446 ],
-			[ $path . 'strängé filename (duplicate #2).txt', 446 ],
-		];
-	}
+        return [
+            [ $path . 'lorem.txt', 446 ],
+            [ $path . 'strängé filename (duplicate #2).txt', 446 ],
+        ];
+    }
 
-	/**
-	 * @dataProvider dataFileNameProvider
-	 */
-	public function XtestGetFileSizeViaCurl($filename, $fileSize) {
-		if (!extension_loaded('curl')) {
-			$this->markTestSkipped(
-				'The PHP curl extension is required for this test.'
-			);
-		}
-		if (\OC::$server->get(IniGetWrapper::class)->getString('open_basedir') !== '') {
-			$this->markTestSkipped(
-				'The PHP curl extension does not work with the file:// protocol when open_basedir is enabled.'
-			);
-		}
-		$this->assertSame(
-			$fileSize,
-			$this->helper->getFileSizeViaCurl($filename)
-		);
-	}
+    /**
+     * @dataProvider dataFileNameProvider
+     */
+    public function XtestGetFileSizeViaCurl($filename, $fileSize) {
+        if (!extension_loaded('curl')) {
+            $this->markTestSkipped(
+                'The PHP curl extension is required for this test.'
+            );
+        }
+        if (\OC::$server->get(IniGetWrapper::class)->getString('open_basedir') !== '') {
+            $this->markTestSkipped(
+                'The PHP curl extension does not work with the file:// protocol when open_basedir is enabled.'
+            );
+        }
+        $this->assertSame(
+            $fileSize,
+            $this->helper->getFileSizeViaCurl($filename)
+        );
+    }
 
-	/**
-	 * @dataProvider dataFileNameProvider
-	 */
-	public function testGetFileSizeViaExec($filename, $fileSize): void {
-		if (escapeshellarg('strängé') !== '\'strängé\'') {
-			$this->markTestSkipped('Your escapeshell args removes accents');
-		}
-		if (!\OCP\Util::isFunctionEnabled('exec')) {
-			$this->markTestSkipped(
-				'The exec() function needs to be enabled for this test.'
-			);
-		}
-		$this->assertSame(
-			$fileSize,
-			$this->helper->getFileSizeViaExec($filename)
-		);
-	}
+    /**
+     * @dataProvider dataFileNameProvider
+     */
+    public function testGetFileSizeViaExec($filename, $fileSize): void {
+        if (escapeshellarg('strängé') !== '\'strängé\'') {
+            $this->markTestSkipped('Your escapeshell args removes accents');
+        }
+        if (!\OCP\Util::isFunctionEnabled('exec')) {
+            $this->markTestSkipped(
+                'The exec() function needs to be enabled for this test.'
+            );
+        }
+        $this->assertSame(
+            $fileSize,
+            $this->helper->getFileSizeViaExec($filename)
+        );
+    }
 
-	/**
-	 * @dataProvider dataFileNameProvider
-	 */
-	public function testGetFileSizeNative($filename, $fileSize): void {
-		$this->assertSame(
-			$fileSize,
-			$this->helper->getFileSizeNative($filename)
-		);
-	}
+    /**
+     * @dataProvider dataFileNameProvider
+     */
+    public function testGetFileSizeNative($filename, $fileSize): void {
+        $this->assertSame(
+            $fileSize,
+            $this->helper->getFileSizeNative($filename)
+        );
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -27,11 +27,11 @@
 	}
 
 	public static function dataFileNameProvider(): array {
-		$path = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR;
+		$path = dirname(__DIR__).DIRECTORY_SEPARATOR.'data'.DIRECTORY_SEPARATOR;
 
 		return [
-			[ $path . 'lorem.txt', 446 ],
-			[ $path . 'strängé filename (duplicate #2).txt', 446 ],
+			[$path.'lorem.txt', 446],
+			[$path.'strängé filename (duplicate #2).txt', 446],
 		];
 	}
 

tests/lib/Memcache/FactoryTest.php

Indentation +106 added lines, -106 removed lines

@@ -12,129 +12,129 @@
 use Psr\Log\LoggerInterface;
 
 class Test_Factory_Available_Cache1 extends NullCache {
-	public function __construct($prefix = '') {
-	}
+    public function __construct($prefix = '') {
+    }
 
-	public static function isAvailable(): bool {
-		return true;
-	}
+    public static function isAvailable(): bool {
+        return true;
+    }
 }
 
 class Test_Factory_Available_Cache2 extends NullCache {
-	public function __construct($prefix = '') {
-	}
+    public function __construct($prefix = '') {
+    }
 
-	public static function isAvailable(): bool {
-		return true;
-	}
+    public static function isAvailable(): bool {
+        return true;
+    }
 }
 
 class Test_Factory_Unavailable_Cache1 extends NullCache {
-	public function __construct($prefix = '') {
-	}
+    public function __construct($prefix = '') {
+    }
 
-	public static function isAvailable(): bool {
-		return false;
-	}
+    public static function isAvailable(): bool {
+        return false;
+    }
 }
 
 class Test_Factory_Unavailable_Cache2 extends NullCache {
-	public function __construct($prefix = '') {
-	}
+    public function __construct($prefix = '') {
+    }
 
-	public static function isAvailable(): bool {
-		return false;
-	}
+    public static function isAvailable(): bool {
+        return false;
+    }
 }
 
 /**
  * @group Memcache
  */
 class FactoryTest extends \Test\TestCase {
-	public const AVAILABLE1 = '\\Test\\Memcache\\Test_Factory_Available_Cache1';
-	public const AVAILABLE2 = '\\Test\\Memcache\\Test_Factory_Available_Cache2';
-	public const UNAVAILABLE1 = '\\Test\\Memcache\\Test_Factory_Unavailable_Cache1';
-	public const UNAVAILABLE2 = '\\Test\\Memcache\\Test_Factory_Unavailable_Cache2';
-
-	public static function cacheAvailabilityProvider(): array {
-		return [
-			[
-				// local and distributed available
-				self::AVAILABLE1, self::AVAILABLE2, null,
-				self::AVAILABLE1, self::AVAILABLE2, \OC\Memcache\Factory::NULL_CACHE
-			],
-			[
-				// local and distributed null
-				null, null, null,
-				\OC\Memcache\Factory::NULL_CACHE, \OC\Memcache\Factory::NULL_CACHE, \OC\Memcache\Factory::NULL_CACHE
-			],
-			[
-				// local available, distributed null (most common scenario)
-				self::AVAILABLE1, null, null,
-				self::AVAILABLE1, self::AVAILABLE1, \OC\Memcache\Factory::NULL_CACHE
-			],
-			[
-				// locking cache available
-				null, null, self::AVAILABLE1,
-				\OC\Memcache\Factory::NULL_CACHE, \OC\Memcache\Factory::NULL_CACHE, self::AVAILABLE1
-			],
-			[
-				// locking cache unavailable: no exception here in the factory
-				null, null, self::UNAVAILABLE1,
-				\OC\Memcache\Factory::NULL_CACHE, \OC\Memcache\Factory::NULL_CACHE, \OC\Memcache\Factory::NULL_CACHE
-			]
-		];
-	}
-
-	public static function cacheUnavailableProvider(): array {
-		return [
-			[
-				// local available, distributed unavailable
-				self::AVAILABLE1, self::UNAVAILABLE1
-			],
-			[
-				// local unavailable, distributed available
-				self::UNAVAILABLE1, self::AVAILABLE1
-			],
-			[
-				// local and distributed unavailable
-				self::UNAVAILABLE1, self::UNAVAILABLE2
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider cacheAvailabilityProvider
-	 */
-	public function testCacheAvailability($localCache, $distributedCache, $lockingCache,
-		$expectedLocalCache, $expectedDistributedCache, $expectedLockingCache): void {
-		$logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
-		$profiler = $this->getMockBuilder(IProfiler::class)->getMock();
-		$factory = new \OC\Memcache\Factory(fn () => 'abc', $logger, $profiler, $localCache, $distributedCache, $lockingCache);
-		$this->assertTrue(is_a($factory->createLocal(), $expectedLocalCache));
-		$this->assertTrue(is_a($factory->createDistributed(), $expectedDistributedCache));
-		$this->assertTrue(is_a($factory->createLocking(), $expectedLockingCache));
-	}
-
-	/**
-	 * @dataProvider cacheUnavailableProvider
-	 */
-	public function testCacheNotAvailableException($localCache, $distributedCache): void {
-		$this->expectException(\OCP\HintException::class);
-
-		$logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
-		$profiler = $this->getMockBuilder(IProfiler::class)->getMock();
-		new \OC\Memcache\Factory(fn () => 'abc', $logger, $profiler, $localCache, $distributedCache);
-	}
-
-	public function testCreateInMemory(): void {
-		$logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
-		$profiler = $this->getMockBuilder(IProfiler::class)->getMock();
-		$factory = new \OC\Memcache\Factory(fn () => 'abc', $logger, $profiler, null, null, null);
-
-		$cache = $factory->createInMemory();
-		$cache->set('test', 48);
-
-		self::assertSame(48, $cache->get('test'));
-	}
+    public const AVAILABLE1 = '\\Test\\Memcache\\Test_Factory_Available_Cache1';
+    public const AVAILABLE2 = '\\Test\\Memcache\\Test_Factory_Available_Cache2';
+    public const UNAVAILABLE1 = '\\Test\\Memcache\\Test_Factory_Unavailable_Cache1';
+    public const UNAVAILABLE2 = '\\Test\\Memcache\\Test_Factory_Unavailable_Cache2';
+
+    public static function cacheAvailabilityProvider(): array {
+        return [
+            [
+                // local and distributed available
+                self::AVAILABLE1, self::AVAILABLE2, null,
+                self::AVAILABLE1, self::AVAILABLE2, \OC\Memcache\Factory::NULL_CACHE
+            ],
+            [
+                // local and distributed null
+                null, null, null,
+                \OC\Memcache\Factory::NULL_CACHE, \OC\Memcache\Factory::NULL_CACHE, \OC\Memcache\Factory::NULL_CACHE
+            ],
+            [
+                // local available, distributed null (most common scenario)
+                self::AVAILABLE1, null, null,
+                self::AVAILABLE1, self::AVAILABLE1, \OC\Memcache\Factory::NULL_CACHE
+            ],
+            [
+                // locking cache available
+                null, null, self::AVAILABLE1,
+                \OC\Memcache\Factory::NULL_CACHE, \OC\Memcache\Factory::NULL_CACHE, self::AVAILABLE1
+            ],
+            [
+                // locking cache unavailable: no exception here in the factory
+                null, null, self::UNAVAILABLE1,
+                \OC\Memcache\Factory::NULL_CACHE, \OC\Memcache\Factory::NULL_CACHE, \OC\Memcache\Factory::NULL_CACHE
+            ]
+        ];
+    }
+
+    public static function cacheUnavailableProvider(): array {
+        return [
+            [
+                // local available, distributed unavailable
+                self::AVAILABLE1, self::UNAVAILABLE1
+            ],
+            [
+                // local unavailable, distributed available
+                self::UNAVAILABLE1, self::AVAILABLE1
+            ],
+            [
+                // local and distributed unavailable
+                self::UNAVAILABLE1, self::UNAVAILABLE2
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider cacheAvailabilityProvider
+     */
+    public function testCacheAvailability($localCache, $distributedCache, $lockingCache,
+        $expectedLocalCache, $expectedDistributedCache, $expectedLockingCache): void {
+        $logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
+        $profiler = $this->getMockBuilder(IProfiler::class)->getMock();
+        $factory = new \OC\Memcache\Factory(fn () => 'abc', $logger, $profiler, $localCache, $distributedCache, $lockingCache);
+        $this->assertTrue(is_a($factory->createLocal(), $expectedLocalCache));
+        $this->assertTrue(is_a($factory->createDistributed(), $expectedDistributedCache));
+        $this->assertTrue(is_a($factory->createLocking(), $expectedLockingCache));
+    }
+
+    /**
+     * @dataProvider cacheUnavailableProvider
+     */
+    public function testCacheNotAvailableException($localCache, $distributedCache): void {
+        $this->expectException(\OCP\HintException::class);
+
+        $logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
+        $profiler = $this->getMockBuilder(IProfiler::class)->getMock();
+        new \OC\Memcache\Factory(fn () => 'abc', $logger, $profiler, $localCache, $distributedCache);
+    }
+
+    public function testCreateInMemory(): void {
+        $logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
+        $profiler = $this->getMockBuilder(IProfiler::class)->getMock();
+        $factory = new \OC\Memcache\Factory(fn () => 'abc', $logger, $profiler, null, null, null);
+
+        $cache = $factory->createInMemory();
+        $cache->set('test', 48);
+
+        self::assertSame(48, $cache->get('test'));
+    }
 }

tests/lib/Encryption/UtilTest.php

Indentation +238 added lines, -238 removed lines

@@ -15,242 +15,242 @@
 use Test\TestCase;
 
 class UtilTest extends TestCase {
-	/**
-	 * block size will always be 8192 for a PHP stream
-	 *
-	 * @see https://bugs.php.net/bug.php?id=21641
-	 */
-	protected static int $headerSize = 8192;
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject */
-	protected $view;
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject|IUserManager */
-	protected $userManager;
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject|IGroupManager */
-	protected $groupManager;
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject|IConfig */
-	private $config;
-	private Util $util;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->view = $this->getMockBuilder(View::class)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$this->userManager = $this->createMock(IUserManager::class);
-		$this->groupManager = $this->createMock(IGroupManager::class);
-		$this->config = $this->createMock(IConfig::class);
-
-		$this->util = new Util(
-			$this->view,
-			$this->userManager,
-			$this->groupManager,
-			$this->config
-		);
-	}
-
-	/**
-	 * @dataProvider providesHeadersForEncryptionModule
-	 */
-	public function testGetEncryptionModuleId($expected, $header): void {
-		$id = $this->util->getEncryptionModuleId($header);
-		$this->assertEquals($expected, $id);
-	}
-
-	public static function providesHeadersForEncryptionModule(): array {
-		return [
-			['', []],
-			['', ['1']],
-			[2, ['oc_encryption_module' => 2]],
-		];
-	}
-
-	/**
-	 * @dataProvider providesHeaders
-	 */
-	public function testCreateHeader($expected, $header, $moduleId): void {
-		$em = $this->createMock(IEncryptionModule::class);
-		$em->expects($this->any())->method('getId')->willReturn($moduleId);
-
-		$result = $this->util->createHeader($header, $em);
-		$this->assertEquals($expected, $result);
-	}
-
-	public static function providesHeaders(): array {
-		return [
-			[str_pad('HBEGIN:oc_encryption_module:0:HEND', self::$headerSize, '-', STR_PAD_RIGHT)
-				, [], '0'],
-			[str_pad('HBEGIN:oc_encryption_module:0:custom_header:foo:HEND', self::$headerSize, '-', STR_PAD_RIGHT)
-				, ['custom_header' => 'foo'], '0'],
-		];
-	}
-
-
-	public function testCreateHeaderFailed(): void {
-		$this->expectException(\OC\Encryption\Exceptions\EncryptionHeaderKeyExistsException::class);
-
-
-		$header = ['header1' => 1, 'header2' => 2, 'oc_encryption_module' => 'foo'];
-
-		$em = $this->createMock(IEncryptionModule::class);
-		$em->expects($this->any())->method('getId')->willReturn('moduleId');
-
-		$this->util->createHeader($header, $em);
-	}
-
-	/**
-	 * @dataProvider providePathsForTestIsExcluded
-	 */
-	public function testIsExcluded($path, $keyStorageRoot, $expected): void {
-		$this->config->expects($this->once())
-			->method('getAppValue')
-			->with('core', 'encryption_key_storage_root', '')
-			->willReturn($keyStorageRoot);
-		$this->userManager
-			->expects($this->any())
-			->method('userExists')
-			->willReturnCallback([$this, 'isExcludedCallback']);
-
-		$this->assertSame($expected,
-			$this->util->isExcluded($path)
-		);
-	}
-
-	public static function providePathsForTestIsExcluded(): array {
-		return [
-			['/files_encryption', '', true],
-			['files_encryption/foo.txt', '', true],
-			['test/foo.txt', '', false],
-			['/user1/files_encryption/foo.txt', '', true],
-			['/user1/files/foo.txt', '', false],
-			['/keyStorage/user1/files/foo.txt', 'keyStorage', true],
-			['/keyStorage/files_encryption', '/keyStorage', true],
-			['keyStorage/user1/files_encryption', '/keyStorage/', true],
-
-		];
-	}
-
-	public function isExcludedCallback() {
-		$args = func_get_args();
-		if ($args[0] === 'user1') {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @dataProvider dataTestIsFile
-	 */
-	public function testIsFile($path, $expected): void {
-		$this->assertSame($expected,
-			$this->util->isFile($path)
-		);
-	}
-
-	public static function dataTestIsFile(): array {
-		return [
-			['/user/files/test.txt', true],
-			['/user/files', true],
-			['/user/files_versions/test.txt', false],
-			['/user/foo/files/test.txt', false],
-			['/files/foo/files/test.txt', false],
-			['/user', false],
-			['/user/test.txt', false],
-		];
-	}
-
-	/**
-	 * @dataProvider dataTestStripPartialFileExtension
-	 *
-	 * @param string $path
-	 * @param string $expected
-	 */
-	public function testStripPartialFileExtension($path, $expected): void {
-		$this->assertSame($expected,
-			$this->util->stripPartialFileExtension($path));
-	}
-
-	public static function dataTestStripPartialFileExtension(): array {
-		return [
-			['/foo/test.txt', '/foo/test.txt'],
-			['/foo/test.txt.part', '/foo/test.txt'],
-			['/foo/test.txt.ocTransferId7567846853.part', '/foo/test.txt'],
-			['/foo/test.txt.ocTransferId7567.part', '/foo/test.txt'],
-		];
-	}
-
-	/**
-	 * @dataProvider dataTestParseRawHeader
-	 */
-	public function testParseRawHeader($rawHeader, $expected): void {
-		$result = $this->util->parseRawHeader($rawHeader);
-		$this->assertSameSize($expected, $result);
-		foreach ($result as $key => $value) {
-			$this->assertArrayHasKey($key, $expected);
-			$this->assertSame($expected[$key], $value);
-		}
-	}
-
-	public static function dataTestParseRawHeader(): array {
-		return [
-			[str_pad('HBEGIN:oc_encryption_module:0:HEND', self::$headerSize, '-', STR_PAD_RIGHT)
-				, [Util::HEADER_ENCRYPTION_MODULE_KEY => '0']],
-			[str_pad('HBEGIN:oc_encryption_module:0:custom_header:foo:HEND', self::$headerSize, '-', STR_PAD_RIGHT)
-				, ['custom_header' => 'foo', Util::HEADER_ENCRYPTION_MODULE_KEY => '0']],
-			[str_pad('HelloWorld', self::$headerSize, '-', STR_PAD_RIGHT), []],
-			['', []],
-			[str_pad('HBEGIN:oc_encryption_module:0', self::$headerSize, '-', STR_PAD_RIGHT)
-				, []],
-			[str_pad('oc_encryption_module:0:HEND', self::$headerSize, '-', STR_PAD_RIGHT)
-				, []],
-		];
-	}
-
-	/**
-	 * @dataProvider dataTestGetFileKeyDir
-	 *
-	 * @param bool $isSystemWideMountPoint
-	 * @param string $storageRoot
-	 * @param string $expected
-	 */
-	public function testGetFileKeyDir($isSystemWideMountPoint, $storageRoot, $expected): void {
-		$path = '/user1/files/foo/bar.txt';
-		$owner = 'user1';
-		$relativePath = '/foo/bar.txt';
-
-		$util = $this->getMockBuilder(Util::class)
-			->onlyMethods(['isSystemWideMountPoint', 'getUidAndFilename', 'getKeyStorageRoot'])
-			->setConstructorArgs([
-				$this->view,
-				$this->userManager,
-				$this->groupManager,
-				$this->config
-			])
-			->getMock();
-
-		$util->expects($this->once())->method('getKeyStorageRoot')
-			->willReturn($storageRoot);
-		$util->expects($this->once())->method('isSystemWideMountPoint')
-			->willReturn($isSystemWideMountPoint);
-		$util->expects($this->once())->method('getUidAndFilename')
-			->with($path)->willReturn([$owner, $relativePath]);
-
-		$this->assertSame($expected,
-			$util->getFileKeyDir('OC_DEFAULT_MODULE', $path)
-		);
-	}
-
-	public static function dataTestGetFileKeyDir(): array {
-		return [
-			[false, '', '/user1/files_encryption/keys/foo/bar.txt/OC_DEFAULT_MODULE/'],
-			[true, '', '/files_encryption/keys/foo/bar.txt/OC_DEFAULT_MODULE/'],
-			[false, 'newStorageRoot', '/newStorageRoot/user1/files_encryption/keys/foo/bar.txt/OC_DEFAULT_MODULE/'],
-			[true, 'newStorageRoot', '/newStorageRoot/files_encryption/keys/foo/bar.txt/OC_DEFAULT_MODULE/'],
-		];
-	}
+    /**
+     * block size will always be 8192 for a PHP stream
+     *
+     * @see https://bugs.php.net/bug.php?id=21641
+     */
+    protected static int $headerSize = 8192;
+
+    /** @var \PHPUnit\Framework\MockObject\MockObject */
+    protected $view;
+
+    /** @var \PHPUnit\Framework\MockObject\MockObject|IUserManager */
+    protected $userManager;
+
+    /** @var \PHPUnit\Framework\MockObject\MockObject|IGroupManager */
+    protected $groupManager;
+
+    /** @var \PHPUnit\Framework\MockObject\MockObject|IConfig */
+    private $config;
+    private Util $util;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->view = $this->getMockBuilder(View::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->userManager = $this->createMock(IUserManager::class);
+        $this->groupManager = $this->createMock(IGroupManager::class);
+        $this->config = $this->createMock(IConfig::class);
+
+        $this->util = new Util(
+            $this->view,
+            $this->userManager,
+            $this->groupManager,
+            $this->config
+        );
+    }
+
+    /**
+     * @dataProvider providesHeadersForEncryptionModule
+     */
+    public function testGetEncryptionModuleId($expected, $header): void {
+        $id = $this->util->getEncryptionModuleId($header);
+        $this->assertEquals($expected, $id);
+    }
+
+    public static function providesHeadersForEncryptionModule(): array {
+        return [
+            ['', []],
+            ['', ['1']],
+            [2, ['oc_encryption_module' => 2]],
+        ];
+    }
+
+    /**
+     * @dataProvider providesHeaders
+     */
+    public function testCreateHeader($expected, $header, $moduleId): void {
+        $em = $this->createMock(IEncryptionModule::class);
+        $em->expects($this->any())->method('getId')->willReturn($moduleId);
+
+        $result = $this->util->createHeader($header, $em);
+        $this->assertEquals($expected, $result);
+    }
+
+    public static function providesHeaders(): array {
+        return [
+            [str_pad('HBEGIN:oc_encryption_module:0:HEND', self::$headerSize, '-', STR_PAD_RIGHT)
+                , [], '0'],
+            [str_pad('HBEGIN:oc_encryption_module:0:custom_header:foo:HEND', self::$headerSize, '-', STR_PAD_RIGHT)
+                , ['custom_header' => 'foo'], '0'],
+        ];
+    }
+
+
+    public function testCreateHeaderFailed(): void {
+        $this->expectException(\OC\Encryption\Exceptions\EncryptionHeaderKeyExistsException::class);
+
+
+        $header = ['header1' => 1, 'header2' => 2, 'oc_encryption_module' => 'foo'];
+
+        $em = $this->createMock(IEncryptionModule::class);
+        $em->expects($this->any())->method('getId')->willReturn('moduleId');
+
+        $this->util->createHeader($header, $em);
+    }
+
+    /**
+     * @dataProvider providePathsForTestIsExcluded
+     */
+    public function testIsExcluded($path, $keyStorageRoot, $expected): void {
+        $this->config->expects($this->once())
+            ->method('getAppValue')
+            ->with('core', 'encryption_key_storage_root', '')
+            ->willReturn($keyStorageRoot);
+        $this->userManager
+            ->expects($this->any())
+            ->method('userExists')
+            ->willReturnCallback([$this, 'isExcludedCallback']);
+
+        $this->assertSame($expected,
+            $this->util->isExcluded($path)
+        );
+    }
+
+    public static function providePathsForTestIsExcluded(): array {
+        return [
+            ['/files_encryption', '', true],
+            ['files_encryption/foo.txt', '', true],
+            ['test/foo.txt', '', false],
+            ['/user1/files_encryption/foo.txt', '', true],
+            ['/user1/files/foo.txt', '', false],
+            ['/keyStorage/user1/files/foo.txt', 'keyStorage', true],
+            ['/keyStorage/files_encryption', '/keyStorage', true],
+            ['keyStorage/user1/files_encryption', '/keyStorage/', true],
+
+        ];
+    }
+
+    public function isExcludedCallback() {
+        $args = func_get_args();
+        if ($args[0] === 'user1') {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @dataProvider dataTestIsFile
+     */
+    public function testIsFile($path, $expected): void {
+        $this->assertSame($expected,
+            $this->util->isFile($path)
+        );
+    }
+
+    public static function dataTestIsFile(): array {
+        return [
+            ['/user/files/test.txt', true],
+            ['/user/files', true],
+            ['/user/files_versions/test.txt', false],
+            ['/user/foo/files/test.txt', false],
+            ['/files/foo/files/test.txt', false],
+            ['/user', false],
+            ['/user/test.txt', false],
+        ];
+    }
+
+    /**
+     * @dataProvider dataTestStripPartialFileExtension
+     *
+     * @param string $path
+     * @param string $expected
+     */
+    public function testStripPartialFileExtension($path, $expected): void {
+        $this->assertSame($expected,
+            $this->util->stripPartialFileExtension($path));
+    }
+
+    public static function dataTestStripPartialFileExtension(): array {
+        return [
+            ['/foo/test.txt', '/foo/test.txt'],
+            ['/foo/test.txt.part', '/foo/test.txt'],
+            ['/foo/test.txt.ocTransferId7567846853.part', '/foo/test.txt'],
+            ['/foo/test.txt.ocTransferId7567.part', '/foo/test.txt'],
+        ];
+    }
+
+    /**
+     * @dataProvider dataTestParseRawHeader
+     */
+    public function testParseRawHeader($rawHeader, $expected): void {
+        $result = $this->util->parseRawHeader($rawHeader);
+        $this->assertSameSize($expected, $result);
+        foreach ($result as $key => $value) {
+            $this->assertArrayHasKey($key, $expected);
+            $this->assertSame($expected[$key], $value);
+        }
+    }
+
+    public static function dataTestParseRawHeader(): array {
+        return [
+            [str_pad('HBEGIN:oc_encryption_module:0:HEND', self::$headerSize, '-', STR_PAD_RIGHT)
+                , [Util::HEADER_ENCRYPTION_MODULE_KEY => '0']],
+            [str_pad('HBEGIN:oc_encryption_module:0:custom_header:foo:HEND', self::$headerSize, '-', STR_PAD_RIGHT)
+                , ['custom_header' => 'foo', Util::HEADER_ENCRYPTION_MODULE_KEY => '0']],
+            [str_pad('HelloWorld', self::$headerSize, '-', STR_PAD_RIGHT), []],
+            ['', []],
+            [str_pad('HBEGIN:oc_encryption_module:0', self::$headerSize, '-', STR_PAD_RIGHT)
+                , []],
+            [str_pad('oc_encryption_module:0:HEND', self::$headerSize, '-', STR_PAD_RIGHT)
+                , []],
+        ];
+    }
+
+    /**
+     * @dataProvider dataTestGetFileKeyDir
+     *
+     * @param bool $isSystemWideMountPoint
+     * @param string $storageRoot
+     * @param string $expected
+     */
+    public function testGetFileKeyDir($isSystemWideMountPoint, $storageRoot, $expected): void {
+        $path = '/user1/files/foo/bar.txt';
+        $owner = 'user1';
+        $relativePath = '/foo/bar.txt';
+
+        $util = $this->getMockBuilder(Util::class)
+            ->onlyMethods(['isSystemWideMountPoint', 'getUidAndFilename', 'getKeyStorageRoot'])
+            ->setConstructorArgs([
+                $this->view,
+                $this->userManager,
+                $this->groupManager,
+                $this->config
+            ])
+            ->getMock();
+
+        $util->expects($this->once())->method('getKeyStorageRoot')
+            ->willReturn($storageRoot);
+        $util->expects($this->once())->method('isSystemWideMountPoint')
+            ->willReturn($isSystemWideMountPoint);
+        $util->expects($this->once())->method('getUidAndFilename')
+            ->with($path)->willReturn([$owner, $relativePath]);
+
+        $this->assertSame($expected,
+            $util->getFileKeyDir('OC_DEFAULT_MODULE', $path)
+        );
+    }
+
+    public static function dataTestGetFileKeyDir(): array {
+        return [
+            [false, '', '/user1/files_encryption/keys/foo/bar.txt/OC_DEFAULT_MODULE/'],
+            [true, '', '/files_encryption/keys/foo/bar.txt/OC_DEFAULT_MODULE/'],
+            [false, 'newStorageRoot', '/newStorageRoot/user1/files_encryption/keys/foo/bar.txt/OC_DEFAULT_MODULE/'],
+            [true, 'newStorageRoot', '/newStorageRoot/files_encryption/keys/foo/bar.txt/OC_DEFAULT_MODULE/'],
+        ];
+    }
 }

tests/lib/Encryption/UpdateTest.php

Indentation +164 added lines, -164 removed lines

@@ -23,168 +23,168 @@
 use Test\TestCase;
 
 class UpdateTest extends TestCase {
-	private string $uid;
-	private View&MockObject $view;
-	private Util&MockObject $util;
-	private \OC\Encryption\Manager&MockObject $encryptionManager;
-	private IEncryptionModule&MockObject $encryptionModule;
-	private File&MockObject $fileHelper;
-	private LoggerInterface&MockObject $logger;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->view = $this->createMock(View::class);
-		$this->util = $this->createMock(Util::class);
-		$this->encryptionManager = $this->createMock(\OC\Encryption\Manager::class);
-		$this->fileHelper = $this->createMock(File::class);
-		$this->encryptionModule = $this->createMock(IEncryptionModule::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-
-		$this->uid = 'testUser1';
-	}
-
-	private function getUserMock(string $uid): IUser&MockObject {
-		$user = $this->createMock(IUser::class);
-		$user->expects(self::any())
-			->method('getUID')
-			->willReturn($uid);
-		return $user;
-	}
-
-	private function getFileMock(string $path, string $owner): OCPFile&MockObject {
-		$node = $this->createMock(OCPFile::class);
-		$node->expects(self::atLeastOnce())
-			->method('getPath')
-			->willReturn($path);
-		$node->expects(self::any())
-			->method('getOwner')
-			->willReturn($this->getUserMock($owner));
-
-		return $node;
-	}
-
-	private function getFolderMock(string $path, string $owner): Folder&MockObject {
-		$node = $this->createMock(Folder::class);
-		$node->expects(self::atLeastOnce())
-			->method('getPath')
-			->willReturn($path);
-		$node->expects(self::any())
-			->method('getOwner')
-			->willReturn($this->getUserMock($owner));
-
-		return $node;
-	}
-
-	/**
-	 * @dataProvider dataTestUpdate
-	 *
-	 * @param string $path
-	 * @param boolean $isDir
-	 * @param array $allFiles
-	 * @param integer $numberOfFiles
-	 */
-	public function testUpdate($path, $isDir, $allFiles, $numberOfFiles): void {
-		$updateMock = $this->getUpdateMock(['getOwnerPath']);
-		$updateMock->expects($this->once())->method('getOwnerPath')
-			->willReturnCallback(fn (OCPFile|Folder $node) => '/user/' . $node->getPath());
-
-		$this->encryptionManager->expects($this->once())
-			->method('getEncryptionModule')
-			->willReturn($this->encryptionModule);
-
-		if ($isDir) {
-			$this->util->expects($this->once())
-				->method('getAllFiles')
-				->willReturn($allFiles);
-			$node = $this->getFolderMock($path, 'user');
-		} else {
-			$node = $this->getFileMock($path, 'user');
-		}
-
-		$this->fileHelper->expects($this->exactly($numberOfFiles))
-			->method('getAccessList')
-			->willReturn(['users' => [], 'public' => false]);
-
-		$this->encryptionModule->expects($this->exactly($numberOfFiles))
-			->method('update')
-			->willReturn(true);
-
-		$updateMock->update($node);
-	}
-
-	public static function dataTestUpdate(): array {
-		return [
-			['/user/files/foo', true, ['/user/files/foo/file1.txt', '/user/files/foo/file1.txt'], 2],
-			['/user/files/test.txt', false, [], 1],
-		];
-	}
-
-	/**
-	 * @dataProvider dataTestPostRename
-	 *
-	 * @param string $source
-	 * @param string $target
-	 */
-	public function testPostRename($source, $target): void {
-		$updateMock = $this->getUpdateMock(['update','getOwnerPath']);
-
-		$sourceNode = $this->getFileMock($source, 'user');
-		$targetNode = $this->getFileMock($target, 'user');
-
-		if (dirname($source) === dirname($target)) {
-			$updateMock->expects($this->never())->method('getOwnerPath');
-			$updateMock->expects($this->never())->method('update');
-		} else {
-			$updateMock->expects($this->once())->method('update')
-				->willReturnCallback(fn (OCPFile|Folder $node) => $this->assertSame(
-					$target,
-					$node->getPath(),
-					'update needs to be executed for the target destination'
-				));
-		}
-
-		$updateMock->postRename($sourceNode, $targetNode);
-	}
-
-	public static function dataTestPostRename(): array {
-		return [
-			['/test.txt', '/testNew.txt'],
-			['/folder/test.txt', '/testNew.txt'],
-			['/test.txt', '/folder/testNew.txt'],
-		];
-	}
-
-	public function testPostRestore(): void {
-		$updateMock = $this->getUpdateMock(['update']);
-
-		$updateMock->expects($this->once())->method('update')
-			->willReturnCallback(fn (OCPFile|Folder $node) => $this->assertSame(
-				'/folder/test.txt',
-				$node->getPath(),
-				'update needs to be executed for the target destination'
-			));
-
-		$updateMock->postRestore($this->getFileMock('/folder/test.txt', 'user'));
-	}
-
-	/**
-	 * create mock of the update method
-	 *
-	 * @param array $methods methods which should be set
-	 */
-	protected function getUpdateMock(array $methods): Update&MockObject {
-		return  $this->getMockBuilder(Update::class)
-			->setConstructorArgs(
-				[
-					$this->util,
-					$this->encryptionManager,
-					$this->fileHelper,
-					$this->logger,
-					$this->uid
-				]
-			)
-			->onlyMethods($methods)
-			->getMock();
-	}
+    private string $uid;
+    private View&MockObject $view;
+    private Util&MockObject $util;
+    private \OC\Encryption\Manager&MockObject $encryptionManager;
+    private IEncryptionModule&MockObject $encryptionModule;
+    private File&MockObject $fileHelper;
+    private LoggerInterface&MockObject $logger;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->view = $this->createMock(View::class);
+        $this->util = $this->createMock(Util::class);
+        $this->encryptionManager = $this->createMock(\OC\Encryption\Manager::class);
+        $this->fileHelper = $this->createMock(File::class);
+        $this->encryptionModule = $this->createMock(IEncryptionModule::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+
+        $this->uid = 'testUser1';
+    }
+
+    private function getUserMock(string $uid): IUser&MockObject {
+        $user = $this->createMock(IUser::class);
+        $user->expects(self::any())
+            ->method('getUID')
+            ->willReturn($uid);
+        return $user;
+    }
+
+    private function getFileMock(string $path, string $owner): OCPFile&MockObject {
+        $node = $this->createMock(OCPFile::class);
+        $node->expects(self::atLeastOnce())
+            ->method('getPath')
+            ->willReturn($path);
+        $node->expects(self::any())
+            ->method('getOwner')
+            ->willReturn($this->getUserMock($owner));
+
+        return $node;
+    }
+
+    private function getFolderMock(string $path, string $owner): Folder&MockObject {
+        $node = $this->createMock(Folder::class);
+        $node->expects(self::atLeastOnce())
+            ->method('getPath')
+            ->willReturn($path);
+        $node->expects(self::any())
+            ->method('getOwner')
+            ->willReturn($this->getUserMock($owner));
+
+        return $node;
+    }
+
+    /**
+     * @dataProvider dataTestUpdate
+     *
+     * @param string $path
+     * @param boolean $isDir
+     * @param array $allFiles
+     * @param integer $numberOfFiles
+     */
+    public function testUpdate($path, $isDir, $allFiles, $numberOfFiles): void {
+        $updateMock = $this->getUpdateMock(['getOwnerPath']);
+        $updateMock->expects($this->once())->method('getOwnerPath')
+            ->willReturnCallback(fn (OCPFile|Folder $node) => '/user/' . $node->getPath());
+
+        $this->encryptionManager->expects($this->once())
+            ->method('getEncryptionModule')
+            ->willReturn($this->encryptionModule);
+
+        if ($isDir) {
+            $this->util->expects($this->once())
+                ->method('getAllFiles')
+                ->willReturn($allFiles);
+            $node = $this->getFolderMock($path, 'user');
+        } else {
+            $node = $this->getFileMock($path, 'user');
+        }
+
+        $this->fileHelper->expects($this->exactly($numberOfFiles))
+            ->method('getAccessList')
+            ->willReturn(['users' => [], 'public' => false]);
+
+        $this->encryptionModule->expects($this->exactly($numberOfFiles))
+            ->method('update')
+            ->willReturn(true);
+
+        $updateMock->update($node);
+    }
+
+    public static function dataTestUpdate(): array {
+        return [
+            ['/user/files/foo', true, ['/user/files/foo/file1.txt', '/user/files/foo/file1.txt'], 2],
+            ['/user/files/test.txt', false, [], 1],
+        ];
+    }
+
+    /**
+     * @dataProvider dataTestPostRename
+     *
+     * @param string $source
+     * @param string $target
+     */
+    public function testPostRename($source, $target): void {
+        $updateMock = $this->getUpdateMock(['update','getOwnerPath']);
+
+        $sourceNode = $this->getFileMock($source, 'user');
+        $targetNode = $this->getFileMock($target, 'user');
+
+        if (dirname($source) === dirname($target)) {
+            $updateMock->expects($this->never())->method('getOwnerPath');
+            $updateMock->expects($this->never())->method('update');
+        } else {
+            $updateMock->expects($this->once())->method('update')
+                ->willReturnCallback(fn (OCPFile|Folder $node) => $this->assertSame(
+                    $target,
+                    $node->getPath(),
+                    'update needs to be executed for the target destination'
+                ));
+        }
+
+        $updateMock->postRename($sourceNode, $targetNode);
+    }
+
+    public static function dataTestPostRename(): array {
+        return [
+            ['/test.txt', '/testNew.txt'],
+            ['/folder/test.txt', '/testNew.txt'],
+            ['/test.txt', '/folder/testNew.txt'],
+        ];
+    }
+
+    public function testPostRestore(): void {
+        $updateMock = $this->getUpdateMock(['update']);
+
+        $updateMock->expects($this->once())->method('update')
+            ->willReturnCallback(fn (OCPFile|Folder $node) => $this->assertSame(
+                '/folder/test.txt',
+                $node->getPath(),
+                'update needs to be executed for the target destination'
+            ));
+
+        $updateMock->postRestore($this->getFileMock('/folder/test.txt', 'user'));
+    }
+
+    /**
+     * create mock of the update method
+     *
+     * @param array $methods methods which should be set
+     */
+    protected function getUpdateMock(array $methods): Update&MockObject {
+        return  $this->getMockBuilder(Update::class)
+            ->setConstructorArgs(
+                [
+                    $this->util,
+                    $this->encryptionManager,
+                    $this->fileHelper,
+                    $this->logger,
+                    $this->uid
+                ]
+            )
+            ->onlyMethods($methods)
+            ->getMock();
+    }
 }

tests/lib/Encryption/EncryptionWrapperTest.php

Indentation +62 added lines, -62 removed lines

@@ -19,66 +19,66 @@
 use Test\TestCase;
 
 class EncryptionWrapperTest extends TestCase {
-	/** @var EncryptionWrapper */
-	private $instance;
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject | LoggerInterface */
-	private $logger;
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject | \OC\Encryption\Manager */
-	private $manager;
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject | \OC\Memcache\ArrayCache */
-	private $arrayCache;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->arrayCache = $this->createMock(ArrayCache::class);
-		$this->manager = $this->createMock(Manager::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-
-		$this->instance = new EncryptionWrapper($this->arrayCache, $this->manager, $this->logger);
-	}
-
-
-	/**
-	 * @dataProvider provideWrapStorage
-	 */
-	public function testWrapStorage($expectedWrapped, $wrappedStorages): void {
-		$storage = $this->getMockBuilder(IStorage::class)
-			->disableOriginalConstructor()
-			->getMock();
-
-		foreach ($wrappedStorages as $wrapper) {
-			$storage->expects($this->any())
-				->method('instanceOfStorage')
-				->willReturnMap([
-					[$wrapper, true],
-				]);
-		}
-
-		$mount = $this->getMockBuilder(IMountPoint::class)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$returnedStorage = $this->instance->wrapStorage('mountPoint', $storage, $mount);
-
-		$this->assertEquals(
-			$expectedWrapped,
-			$returnedStorage->instanceOfStorage(Encryption::class),
-			'Asserted that the storage is (not) wrapped with encryption'
-		);
-	}
-
-	public static function provideWrapStorage(): array {
-		return [
-			// Wrap when not wrapped or not wrapped with storage
-			[true, []],
-			[true, [Storage::class]],
-
-			// Do not wrap shared storages
-			[false, [IDisableEncryptionStorage::class]],
-		];
-	}
+    /** @var EncryptionWrapper */
+    private $instance;
+
+    /** @var \PHPUnit\Framework\MockObject\MockObject | LoggerInterface */
+    private $logger;
+
+    /** @var \PHPUnit\Framework\MockObject\MockObject | \OC\Encryption\Manager */
+    private $manager;
+
+    /** @var \PHPUnit\Framework\MockObject\MockObject | \OC\Memcache\ArrayCache */
+    private $arrayCache;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->arrayCache = $this->createMock(ArrayCache::class);
+        $this->manager = $this->createMock(Manager::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+
+        $this->instance = new EncryptionWrapper($this->arrayCache, $this->manager, $this->logger);
+    }
+
+
+    /**
+     * @dataProvider provideWrapStorage
+     */
+    public function testWrapStorage($expectedWrapped, $wrappedStorages): void {
+        $storage = $this->getMockBuilder(IStorage::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        foreach ($wrappedStorages as $wrapper) {
+            $storage->expects($this->any())
+                ->method('instanceOfStorage')
+                ->willReturnMap([
+                    [$wrapper, true],
+                ]);
+        }
+
+        $mount = $this->getMockBuilder(IMountPoint::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $returnedStorage = $this->instance->wrapStorage('mountPoint', $storage, $mount);
+
+        $this->assertEquals(
+            $expectedWrapped,
+            $returnedStorage->instanceOfStorage(Encryption::class),
+            'Asserted that the storage is (not) wrapped with encryption'
+        );
+    }
+
+    public static function provideWrapStorage(): array {
+        return [
+            // Wrap when not wrapped or not wrapped with storage
+            [true, []],
+            [true, [Storage::class]],
+
+            // Do not wrap shared storages
+            [false, [IDisableEncryptionStorage::class]],
+        ];
+    }
 }

tests/lib/Cache/FileCacheTest.php

Indentation +134 added lines, -134 removed lines

@@ -19,138 +19,138 @@
  * @package Test\Cache
  */
 class FileCacheTest extends TestCache {
-	use UserTrait;
-
-	/**
-	 * @var string
-	 * */
-	private $user;
-	/**
-	 * @var string
-	 * */
-	private $datadir;
-	/**
-	 * @var \OC\Files\Storage\Storage
-	 * */
-	private $storage;
-	/**
-	 * @var \OC\Files\View
-	 * */
-	private $rootView;
-
-	public function skip() {
-		//$this->skipUnless(OC_User::isLoggedIn());
-	}
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		//login
-		$this->createUser('test', 'test');
-
-		$this->user = \OC_User::getUser();
-		\OC_User::setUserId('test');
-
-		//clear all proxies and hooks so we can do clean testing
-		\OC_Hook::clear('OC_Filesystem');
-
-		/** @var IMountManager $manager */
-		$manager = \OC::$server->get(IMountManager::class);
-		$manager->removeMount('/test');
-
-		$storage = new \OC\Files\Storage\Temporary([]);
-		\OC\Files\Filesystem::mount($storage, [], '/test/cache');
-
-		//set up the users dir
-		$this->rootView = new \OC\Files\View('');
-		$this->rootView->mkdir('/test');
-
-		$this->instance = new \OC\Cache\File();
-
-		// forces creation of cache folder for subsequent tests
-		$this->instance->set('hack', 'hack');
-	}
-
-	protected function tearDown(): void {
-		if ($this->instance) {
-			$this->instance->remove('hack', 'hack');
-		}
-
-		\OC_User::setUserId($this->user);
-
-		if ($this->instance) {
-			$this->instance->clear();
-			$this->instance = null;
-		}
-
-		parent::tearDown();
-	}
-
-	private function setupMockStorage() {
-		$mockStorage = $this->getMockBuilder(Local::class)
-			->onlyMethods(['filemtime', 'unlink'])
-			->setConstructorArgs([['datadir' => \OC::$server->getTempManager()->getTemporaryFolder()]])
-			->getMock();
-
-		\OC\Files\Filesystem::mount($mockStorage, [], '/test/cache');
-
-		return $mockStorage;
-	}
-
-	public function testGarbageCollectOldKeys(): void {
-		$mockStorage = $this->setupMockStorage();
-
-		$mockStorage->expects($this->atLeastOnce())
-			->method('filemtime')
-			->willReturn(100);
-		$mockStorage->expects($this->once())
-			->method('unlink')
-			->with('key1')
-			->willReturn(true);
-
-		$this->instance->set('key1', 'value1');
-		$this->instance->gc();
-	}
-
-	public function testGarbageCollectLeaveRecentKeys(): void {
-		$mockStorage = $this->setupMockStorage();
-
-		$mockStorage->expects($this->atLeastOnce())
-			->method('filemtime')
-			->willReturn(time() + 3600);
-		$mockStorage->expects($this->never())
-			->method('unlink')
-			->with('key1');
-		$this->instance->set('key1', 'value1');
-		$this->instance->gc();
-	}
-
-	public static function lockExceptionProvider(): array {
-		return [
-			[new \OCP\Lock\LockedException('key1')],
-			[new \OCP\Files\LockNotAcquiredException('key1', 1)],
-		];
-	}
-
-	/**
-	 * @dataProvider lockExceptionProvider
-	 */
-	public function testGarbageCollectIgnoreLockedKeys($testException): void {
-		$mockStorage = $this->setupMockStorage();
-
-		$mockStorage->expects($this->atLeastOnce())
-			->method('filemtime')
-			->willReturn(100);
-		$mockStorage->expects($this->atLeastOnce())
-			->method('unlink')
-			->will($this->onConsecutiveCalls(
-				$this->throwException($testException),
-				$this->returnValue(true)
-			));
-
-		$this->instance->set('key1', 'value1');
-		$this->instance->set('key2', 'value2');
-
-		$this->instance->gc();
-	}
+    use UserTrait;
+
+    /**
+     * @var string
+     * */
+    private $user;
+    /**
+     * @var string
+     * */
+    private $datadir;
+    /**
+     * @var \OC\Files\Storage\Storage
+     * */
+    private $storage;
+    /**
+     * @var \OC\Files\View
+     * */
+    private $rootView;
+
+    public function skip() {
+        //$this->skipUnless(OC_User::isLoggedIn());
+    }
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        //login
+        $this->createUser('test', 'test');
+
+        $this->user = \OC_User::getUser();
+        \OC_User::setUserId('test');
+
+        //clear all proxies and hooks so we can do clean testing
+        \OC_Hook::clear('OC_Filesystem');
+
+        /** @var IMountManager $manager */
+        $manager = \OC::$server->get(IMountManager::class);
+        $manager->removeMount('/test');
+
+        $storage = new \OC\Files\Storage\Temporary([]);
+        \OC\Files\Filesystem::mount($storage, [], '/test/cache');
+
+        //set up the users dir
+        $this->rootView = new \OC\Files\View('');
+        $this->rootView->mkdir('/test');
+
+        $this->instance = new \OC\Cache\File();
+
+        // forces creation of cache folder for subsequent tests
+        $this->instance->set('hack', 'hack');
+    }
+
+    protected function tearDown(): void {
+        if ($this->instance) {
+            $this->instance->remove('hack', 'hack');
+        }
+
+        \OC_User::setUserId($this->user);
+
+        if ($this->instance) {
+            $this->instance->clear();
+            $this->instance = null;
+        }
+
+        parent::tearDown();
+    }
+
+    private function setupMockStorage() {
+        $mockStorage = $this->getMockBuilder(Local::class)
+            ->onlyMethods(['filemtime', 'unlink'])
+            ->setConstructorArgs([['datadir' => \OC::$server->getTempManager()->getTemporaryFolder()]])
+            ->getMock();
+
+        \OC\Files\Filesystem::mount($mockStorage, [], '/test/cache');
+
+        return $mockStorage;
+    }
+
+    public function testGarbageCollectOldKeys(): void {
+        $mockStorage = $this->setupMockStorage();
+
+        $mockStorage->expects($this->atLeastOnce())
+            ->method('filemtime')
+            ->willReturn(100);
+        $mockStorage->expects($this->once())
+            ->method('unlink')
+            ->with('key1')
+            ->willReturn(true);
+
+        $this->instance->set('key1', 'value1');
+        $this->instance->gc();
+    }
+
+    public function testGarbageCollectLeaveRecentKeys(): void {
+        $mockStorage = $this->setupMockStorage();
+
+        $mockStorage->expects($this->atLeastOnce())
+            ->method('filemtime')
+            ->willReturn(time() + 3600);
+        $mockStorage->expects($this->never())
+            ->method('unlink')
+            ->with('key1');
+        $this->instance->set('key1', 'value1');
+        $this->instance->gc();
+    }
+
+    public static function lockExceptionProvider(): array {
+        return [
+            [new \OCP\Lock\LockedException('key1')],
+            [new \OCP\Files\LockNotAcquiredException('key1', 1)],
+        ];
+    }
+
+    /**
+     * @dataProvider lockExceptionProvider
+     */
+    public function testGarbageCollectIgnoreLockedKeys($testException): void {
+        $mockStorage = $this->setupMockStorage();
+
+        $mockStorage->expects($this->atLeastOnce())
+            ->method('filemtime')
+            ->willReturn(100);
+        $mockStorage->expects($this->atLeastOnce())
+            ->method('unlink')
+            ->will($this->onConsecutiveCalls(
+                $this->throwException($testException),
+                $this->returnValue(true)
+            ));
+
+        $this->instance->set('key1', 'value1');
+        $this->instance->set('key2', 'value2');
+
+        $this->instance->gc();
+    }
 }