nextcloud / server

tests/lib/AppFramework/Bootstrap/CoordinatorTest.php

Indentation +74 added lines, -74 removed lines

@@ -27,78 +27,78 @@
 use Test\TestCase;
 
 class CoordinatorTest extends TestCase {
-	private IAppManager&MockObject $appManager;
-	private IServerContainer&MockObject $serverContainer;
-	private Registry&MockObject $crashReporterRegistry;
-	private IManager&MockObject $dashboardManager;
-	private IEventDispatcher&MockObject $eventDispatcher;
-	private IEventLogger&MockObject $eventLogger;
-	private LoggerInterface&MockObject $logger;
-	private Coordinator $coordinator;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->appManager = $this->createMock(IAppManager::class);
-		$this->serverContainer = $this->createMock(IServerContainer::class);
-		$this->crashReporterRegistry = $this->createMock(Registry::class);
-		$this->dashboardManager = $this->createMock(IManager::class);
-		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
-		$this->eventLogger = $this->createMock(IEventLogger::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-
-		$this->coordinator = new Coordinator(
-			$this->serverContainer,
-			$this->crashReporterRegistry,
-			$this->dashboardManager,
-			$this->eventDispatcher,
-			$this->eventLogger,
-			$this->appManager,
-			$this->logger,
-		);
-	}
-
-	public function testBootAppNotLoadable(): void {
-		$appId = 'settings';
-		$this->serverContainer->expects($this->once())
-			->method('query')
-			->with(Application::class)
-			->willThrowException(new QueryException(''));
-		$this->logger->expects($this->once())
-			->method('error');
-
-		$this->coordinator->bootApp($appId);
-	}
-
-	public function testBootAppNotBootable(): void {
-		$appId = 'settings';
-		$mockApp = $this->createMock(Application::class);
-		$this->serverContainer->expects($this->once())
-			->method('query')
-			->with(Application::class)
-			->willReturn($mockApp);
-
-		$this->coordinator->bootApp($appId);
-	}
-
-	public function testBootApp(): void {
-		$appId = 'settings';
-		$mockApp = new class extends App implements IBootstrap {
-			public function __construct() {
-				parent::__construct('test', []);
-			}
-
-			public function register(IRegistrationContext $context): void {
-			}
-
-			public function boot(IBootContext $context): void {
-			}
-		};
-		$this->serverContainer->expects($this->once())
-			->method('query')
-			->with(Application::class)
-			->willReturn($mockApp);
-
-		$this->coordinator->bootApp($appId);
-	}
+    private IAppManager&MockObject $appManager;
+    private IServerContainer&MockObject $serverContainer;
+    private Registry&MockObject $crashReporterRegistry;
+    private IManager&MockObject $dashboardManager;
+    private IEventDispatcher&MockObject $eventDispatcher;
+    private IEventLogger&MockObject $eventLogger;
+    private LoggerInterface&MockObject $logger;
+    private Coordinator $coordinator;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->appManager = $this->createMock(IAppManager::class);
+        $this->serverContainer = $this->createMock(IServerContainer::class);
+        $this->crashReporterRegistry = $this->createMock(Registry::class);
+        $this->dashboardManager = $this->createMock(IManager::class);
+        $this->eventDispatcher = $this->createMock(IEventDispatcher::class);
+        $this->eventLogger = $this->createMock(IEventLogger::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+
+        $this->coordinator = new Coordinator(
+            $this->serverContainer,
+            $this->crashReporterRegistry,
+            $this->dashboardManager,
+            $this->eventDispatcher,
+            $this->eventLogger,
+            $this->appManager,
+            $this->logger,
+        );
+    }
+
+    public function testBootAppNotLoadable(): void {
+        $appId = 'settings';
+        $this->serverContainer->expects($this->once())
+            ->method('query')
+            ->with(Application::class)
+            ->willThrowException(new QueryException(''));
+        $this->logger->expects($this->once())
+            ->method('error');
+
+        $this->coordinator->bootApp($appId);
+    }
+
+    public function testBootAppNotBootable(): void {
+        $appId = 'settings';
+        $mockApp = $this->createMock(Application::class);
+        $this->serverContainer->expects($this->once())
+            ->method('query')
+            ->with(Application::class)
+            ->willReturn($mockApp);
+
+        $this->coordinator->bootApp($appId);
+    }
+
+    public function testBootApp(): void {
+        $appId = 'settings';
+        $mockApp = new class extends App implements IBootstrap {
+            public function __construct() {
+                parent::__construct('test', []);
+            }
+
+            public function register(IRegistrationContext $context): void {
+            }
+
+            public function boot(IBootContext $context): void {
+            }
+        };
+        $this->serverContainer->expects($this->once())
+            ->method('query')
+            ->with(Application::class)
+            ->willReturn($mockApp);
+
+        $this->coordinator->bootApp($appId);
+    }
 }

tests/lib/AppFramework/Bootstrap/BootContextTest.php

Indentation +21 added lines, -21 removed lines

@@ -16,34 +16,34 @@
 use Test\TestCase;
 
 class BootContextTest extends TestCase {
-	private IAppContainer&MockObject $appContainer;
+    private IAppContainer&MockObject $appContainer;
 
-	private BootContext $context;
+    private BootContext $context;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->appContainer = $this->createMock(IAppContainer::class);
+        $this->appContainer = $this->createMock(IAppContainer::class);
 
-		$this->context = new BootContext(
-			$this->appContainer
-		);
-	}
+        $this->context = new BootContext(
+            $this->appContainer
+        );
+    }
 
-	public function testGetAppContainer(): void {
-		$container = $this->context->getAppContainer();
+    public function testGetAppContainer(): void {
+        $container = $this->context->getAppContainer();
 
-		$this->assertSame($this->appContainer, $container);
-	}
+        $this->assertSame($this->appContainer, $container);
+    }
 
-	public function testGetServerContainer(): void {
-		$serverContainer = $this->createMock(IServerContainer::class);
-		$this->appContainer->method('get')
-			->with(IServerContainer::class)
-			->willReturn($serverContainer);
+    public function testGetServerContainer(): void {
+        $serverContainer = $this->createMock(IServerContainer::class);
+        $this->appContainer->method('get')
+            ->with(IServerContainer::class)
+            ->willReturn($serverContainer);
 
-		$container = $this->context->getServerContainer();
+        $container = $this->context->getServerContainer();
 
-		$this->assertSame($serverContainer, $container);
-	}
+        $this->assertSame($serverContainer, $container);
+    }
 }

tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php

Indentation +147 added lines, -147 removed lines

@@ -20,151 +20,151 @@
 use Test\TestCase;
 
 class RegistrationContextTest extends TestCase {
-	private LoggerInterface&MockObject $logger;
-	private RegistrationContext $context;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->logger = $this->createMock(LoggerInterface::class);
-
-		$this->context = new RegistrationContext(
-			$this->logger
-		);
-	}
-
-	public function testRegisterCapability(): void {
-		$app = $this->createMock(App::class);
-		$name = 'abc';
-		$container = $this->createMock(IAppContainer::class);
-		$app->method('getContainer')
-			->willReturn($container);
-		$container->expects($this->once())
-			->method('registerCapability')
-			->with($name);
-		$this->logger->expects($this->never())
-			->method('error');
-
-		$this->context->for('myapp')->registerCapability($name);
-		$this->context->delegateCapabilityRegistrations([
-			'myapp' => $app,
-		]);
-	}
-
-	public function testRegisterEventListener(): void {
-		$event = 'abc';
-		$service = 'def';
-		$dispatcher = $this->createMock(IEventDispatcher::class);
-		$dispatcher->expects($this->once())
-			->method('addServiceListener')
-			->with($event, $service, 0);
-		$this->logger->expects($this->never())
-			->method('error');
-
-		$this->context->for('myapp')->registerEventListener($event, $service);
-		$this->context->delegateEventListenerRegistrations($dispatcher);
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataProvider_TrueFalse')]
-	public function testRegisterService(bool $shared): void {
-		$app = $this->createMock(App::class);
-		$service = 'abc';
-		$factory = function () {
-			return 'def';
-		};
-		$container = $this->createMock(IAppContainer::class);
-		$app->method('getContainer')
-			->willReturn($container);
-		$container->expects($this->once())
-			->method('registerService')
-			->with($service, $factory, $shared);
-		$this->logger->expects($this->never())
-			->method('error');
-
-		$this->context->for('myapp')->registerService($service, $factory, $shared);
-		$this->context->delegateContainerRegistrations([
-			'myapp' => $app,
-		]);
-	}
-
-	public function testRegisterServiceAlias(): void {
-		$app = $this->createMock(App::class);
-		$alias = 'abc';
-		$target = 'def';
-		$container = $this->createMock(IAppContainer::class);
-		$app->method('getContainer')
-			->willReturn($container);
-		$container->expects($this->once())
-			->method('registerAlias')
-			->with($alias, $target);
-		$this->logger->expects($this->never())
-			->method('error');
-
-		$this->context->for('myapp')->registerServiceAlias($alias, $target);
-		$this->context->delegateContainerRegistrations([
-			'myapp' => $app,
-		]);
-	}
-
-	public function testRegisterParameter(): void {
-		$app = $this->createMock(App::class);
-		$name = 'abc';
-		$value = 'def';
-		$container = $this->createMock(IAppContainer::class);
-		$app->method('getContainer')
-			->willReturn($container);
-		$container->expects($this->once())
-			->method('registerParameter')
-			->with($name, $value);
-		$this->logger->expects($this->never())
-			->method('error');
-
-		$this->context->for('myapp')->registerParameter($name, $value);
-		$this->context->delegateContainerRegistrations([
-			'myapp' => $app,
-		]);
-	}
-
-	public function testRegisterUserMigrator(): void {
-		$appIdA = 'myapp';
-		$migratorClassA = 'OCA\App\UserMigration\AppMigrator';
-
-		$appIdB = 'otherapp';
-		$migratorClassB = 'OCA\OtherApp\UserMigration\OtherAppMigrator';
-
-		$serviceRegistrationA = new ServiceRegistration($appIdA, $migratorClassA);
-		$serviceRegistrationB = new ServiceRegistration($appIdB, $migratorClassB);
-
-		$this->context
-			->for($appIdA)
-			->registerUserMigrator($migratorClassA);
-		$this->context
-			->for($appIdB)
-			->registerUserMigrator($migratorClassB);
-
-		$this->assertEquals(
-			[
-				$serviceRegistrationA,
-				$serviceRegistrationB,
-			],
-			$this->context->getUserMigrators(),
-		);
-	}
-
-	public static function dataProvider_TrueFalse(): array {
-		return[
-			[true],
-			[false]
-		];
-	}
-
-	public function testGetMiddlewareRegistrations(): void {
-		$this->context->registerMiddleware('core', TwoFactorMiddleware::class, false);
-
-		$registrations = $this->context->getMiddlewareRegistrations();
-
-		self::assertNotEmpty($registrations);
-		self::assertSame('core', $registrations[0]->getAppId());
-		self::assertSame(TwoFactorMiddleware::class, $registrations[0]->getService());
-	}
+    private LoggerInterface&MockObject $logger;
+    private RegistrationContext $context;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->logger = $this->createMock(LoggerInterface::class);
+
+        $this->context = new RegistrationContext(
+            $this->logger
+        );
+    }
+
+    public function testRegisterCapability(): void {
+        $app = $this->createMock(App::class);
+        $name = 'abc';
+        $container = $this->createMock(IAppContainer::class);
+        $app->method('getContainer')
+            ->willReturn($container);
+        $container->expects($this->once())
+            ->method('registerCapability')
+            ->with($name);
+        $this->logger->expects($this->never())
+            ->method('error');
+
+        $this->context->for('myapp')->registerCapability($name);
+        $this->context->delegateCapabilityRegistrations([
+            'myapp' => $app,
+        ]);
+    }
+
+    public function testRegisterEventListener(): void {
+        $event = 'abc';
+        $service = 'def';
+        $dispatcher = $this->createMock(IEventDispatcher::class);
+        $dispatcher->expects($this->once())
+            ->method('addServiceListener')
+            ->with($event, $service, 0);
+        $this->logger->expects($this->never())
+            ->method('error');
+
+        $this->context->for('myapp')->registerEventListener($event, $service);
+        $this->context->delegateEventListenerRegistrations($dispatcher);
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataProvider_TrueFalse')]
+    public function testRegisterService(bool $shared): void {
+        $app = $this->createMock(App::class);
+        $service = 'abc';
+        $factory = function () {
+            return 'def';
+        };
+        $container = $this->createMock(IAppContainer::class);
+        $app->method('getContainer')
+            ->willReturn($container);
+        $container->expects($this->once())
+            ->method('registerService')
+            ->with($service, $factory, $shared);
+        $this->logger->expects($this->never())
+            ->method('error');
+
+        $this->context->for('myapp')->registerService($service, $factory, $shared);
+        $this->context->delegateContainerRegistrations([
+            'myapp' => $app,
+        ]);
+    }
+
+    public function testRegisterServiceAlias(): void {
+        $app = $this->createMock(App::class);
+        $alias = 'abc';
+        $target = 'def';
+        $container = $this->createMock(IAppContainer::class);
+        $app->method('getContainer')
+            ->willReturn($container);
+        $container->expects($this->once())
+            ->method('registerAlias')
+            ->with($alias, $target);
+        $this->logger->expects($this->never())
+            ->method('error');
+
+        $this->context->for('myapp')->registerServiceAlias($alias, $target);
+        $this->context->delegateContainerRegistrations([
+            'myapp' => $app,
+        ]);
+    }
+
+    public function testRegisterParameter(): void {
+        $app = $this->createMock(App::class);
+        $name = 'abc';
+        $value = 'def';
+        $container = $this->createMock(IAppContainer::class);
+        $app->method('getContainer')
+            ->willReturn($container);
+        $container->expects($this->once())
+            ->method('registerParameter')
+            ->with($name, $value);
+        $this->logger->expects($this->never())
+            ->method('error');
+
+        $this->context->for('myapp')->registerParameter($name, $value);
+        $this->context->delegateContainerRegistrations([
+            'myapp' => $app,
+        ]);
+    }
+
+    public function testRegisterUserMigrator(): void {
+        $appIdA = 'myapp';
+        $migratorClassA = 'OCA\App\UserMigration\AppMigrator';
+
+        $appIdB = 'otherapp';
+        $migratorClassB = 'OCA\OtherApp\UserMigration\OtherAppMigrator';
+
+        $serviceRegistrationA = new ServiceRegistration($appIdA, $migratorClassA);
+        $serviceRegistrationB = new ServiceRegistration($appIdB, $migratorClassB);
+
+        $this->context
+            ->for($appIdA)
+            ->registerUserMigrator($migratorClassA);
+        $this->context
+            ->for($appIdB)
+            ->registerUserMigrator($migratorClassB);
+
+        $this->assertEquals(
+            [
+                $serviceRegistrationA,
+                $serviceRegistrationB,
+            ],
+            $this->context->getUserMigrators(),
+        );
+    }
+
+    public static function dataProvider_TrueFalse(): array {
+        return[
+            [true],
+            [false]
+        ];
+    }
+
+    public function testGetMiddlewareRegistrations(): void {
+        $this->context->registerMiddleware('core', TwoFactorMiddleware::class, false);
+
+        $registrations = $this->context->getMiddlewareRegistrations();
+
+        self::assertNotEmpty($registrations);
+        self::assertSame('core', $registrations[0]->getAppId());
+        self::assertSame(TwoFactorMiddleware::class, $registrations[0]->getService());
+    }
 }

tests/lib/AppFramework/Controller/PublicShareControllerTest.php

Indentation +65 added lines, -65 removed lines

@@ -15,72 +15,72 @@
 use PHPUnit\Framework\MockObject\MockObject;
 
 class TestController extends PublicShareController {
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		ISession $session,
-		private string $hash,
-		private bool $isProtected,
-	) {
-		parent::__construct($appName, $request, $session);
-	}
-
-	protected function getPasswordHash(): string {
-		return $this->hash;
-	}
-
-	public function isValidToken(): bool {
-		return false;
-	}
-
-	protected function isPasswordProtected(): bool {
-		return $this->isProtected;
-	}
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        ISession $session,
+        private string $hash,
+        private bool $isProtected,
+    ) {
+        parent::__construct($appName, $request, $session);
+    }
+
+    protected function getPasswordHash(): string {
+        return $this->hash;
+    }
+
+    public function isValidToken(): bool {
+        return false;
+    }
+
+    protected function isPasswordProtected(): bool {
+        return $this->isProtected;
+    }
 }
 
 class PublicShareControllerTest extends \Test\TestCase {
-	private IRequest&MockObject $request;
-	private ISession&MockObject $session;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->request = $this->createMock(IRequest::class);
-		$this->session = $this->createMock(ISession::class);
-	}
-
-	public function testGetToken(): void {
-		$controller = new TestController('app', $this->request, $this->session, 'hash', false);
-
-		$controller->setToken('test');
-		$this->assertEquals('test', $controller->getToken());
-	}
-
-	public static function dataIsAuthenticated(): array {
-		return [
-			[false, 'token1', 'token1', 'hash1', 'hash1',  true],
-			[false, 'token1', 'token1', 'hash1', 'hash2',  true],
-			[false, 'token1', 'token2', 'hash1', 'hash1',  true],
-			[false, 'token1', 'token2', 'hash1', 'hash2',  true],
-			[ true, 'token1', 'token1', 'hash1', 'hash1',  true],
-			[ true, 'token1', 'token1', 'hash1', 'hash2', false],
-			[ true, 'token1', 'token2', 'hash1', 'hash1', false],
-			[ true, 'token1', 'token2', 'hash1', 'hash2', false],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataIsAuthenticated')]
-	public function testIsAuthenticatedNotPasswordProtected(bool $protected, string $token1, string $token2, string $hash1, string $hash2, bool $expected): void {
-		$controller = new TestController('app', $this->request, $this->session, $hash2, $protected);
-
-		$this->session->method('get')
-			->willReturnMap([
-				['public_link_authenticated_token', $token1],
-				['public_link_authenticated_password_hash', $hash1],
-			]);
-
-		$controller->setToken($token2);
-
-		$this->assertEquals($expected, $controller->isAuthenticated());
-	}
+    private IRequest&MockObject $request;
+    private ISession&MockObject $session;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->request = $this->createMock(IRequest::class);
+        $this->session = $this->createMock(ISession::class);
+    }
+
+    public function testGetToken(): void {
+        $controller = new TestController('app', $this->request, $this->session, 'hash', false);
+
+        $controller->setToken('test');
+        $this->assertEquals('test', $controller->getToken());
+    }
+
+    public static function dataIsAuthenticated(): array {
+        return [
+            [false, 'token1', 'token1', 'hash1', 'hash1',  true],
+            [false, 'token1', 'token1', 'hash1', 'hash2',  true],
+            [false, 'token1', 'token2', 'hash1', 'hash1',  true],
+            [false, 'token1', 'token2', 'hash1', 'hash2',  true],
+            [ true, 'token1', 'token1', 'hash1', 'hash1',  true],
+            [ true, 'token1', 'token1', 'hash1', 'hash2', false],
+            [ true, 'token1', 'token2', 'hash1', 'hash1', false],
+            [ true, 'token1', 'token2', 'hash1', 'hash2', false],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataIsAuthenticated')]
+    public function testIsAuthenticatedNotPasswordProtected(bool $protected, string $token1, string $token2, string $hash1, string $hash2, bool $expected): void {
+        $controller = new TestController('app', $this->request, $this->session, $hash2, $protected);
+
+        $this->session->method('get')
+            ->willReturnMap([
+                ['public_link_authenticated_token', $token1],
+                ['public_link_authenticated_password_hash', $hash1],
+            ]);
+
+        $controller->setToken($token2);
+
+        $this->assertEquals($expected, $controller->isAuthenticated());
+    }
 }

tests/lib/AppFramework/Controller/ApiControllerTest.php

Indentation +21 added lines, -21 removed lines

@@ -20,25 +20,25 @@
 
 
 class ApiControllerTest extends \Test\TestCase {
-	protected ChildApiController $controller;
-
-	public function testCors(): void {
-		$request = new Request(
-			['server' => ['HTTP_ORIGIN' => 'test']],
-			$this->createMock(IRequestId::class),
-			$this->createMock(IConfig::class)
-		);
-		$this->controller = new ChildApiController('app', $request, 'verbs',
-			'headers', 100);
-
-		$response = $this->controller->preflightedCors();
-
-		$headers = $response->getHeaders();
-
-		$this->assertEquals('test', $headers['Access-Control-Allow-Origin']);
-		$this->assertEquals('verbs', $headers['Access-Control-Allow-Methods']);
-		$this->assertEquals('headers', $headers['Access-Control-Allow-Headers']);
-		$this->assertEquals('false', $headers['Access-Control-Allow-Credentials']);
-		$this->assertEquals(100, $headers['Access-Control-Max-Age']);
-	}
+    protected ChildApiController $controller;
+
+    public function testCors(): void {
+        $request = new Request(
+            ['server' => ['HTTP_ORIGIN' => 'test']],
+            $this->createMock(IRequestId::class),
+            $this->createMock(IConfig::class)
+        );
+        $this->controller = new ChildApiController('app', $request, 'verbs',
+            'headers', 100);
+
+        $response = $this->controller->preflightedCors();
+
+        $headers = $response->getHeaders();
+
+        $this->assertEquals('test', $headers['Access-Control-Allow-Origin']);
+        $this->assertEquals('verbs', $headers['Access-Control-Allow-Methods']);
+        $this->assertEquals('headers', $headers['Access-Control-Allow-Headers']);
+        $this->assertEquals('false', $headers['Access-Control-Allow-Credentials']);
+        $this->assertEquals(100, $headers['Access-Control-Max-Age']);
+    }
 }

tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php

Indentation +119 added lines, -119 removed lines

@@ -18,123 +18,123 @@
 use PHPUnit\Framework\MockObject\MockObject;
 
 class AuthPublicShareControllerTest extends \Test\TestCase {
-	private IRequest&MockObject $request;
-	private ISession&MockObject $session;
-	private IURLGenerator&MockObject $urlGenerator;
-	private AuthPublicShareController&MockObject $controller;
-
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->request = $this->createMock(IRequest::class);
-		$this->session = $this->createMock(ISession::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-
-		$this->controller = $this->getMockBuilder(AuthPublicShareController::class)
-			->setConstructorArgs([
-				'app',
-				$this->request,
-				$this->session,
-				$this->urlGenerator
-			])->onlyMethods([
-				'authFailed',
-				'getPasswordHash',
-				'isAuthenticated',
-				'isPasswordProtected',
-				'isValidToken',
-				'showShare',
-				'verifyPassword',
-				'validateIdentity',
-				'generatePassword'
-			])->getMock();
-	}
-
-	public function testShowAuthenticate(): void {
-		$expects = new TemplateResponse('core', 'publicshareauth', [], 'guest');
-
-		$this->assertEquals($expects, $this->controller->showAuthenticate());
-	}
-
-	public function testAuthenticateAuthenticated(): void {
-		$this->controller->method('isAuthenticated')
-			->willReturn(true);
-
-		$this->controller->setToken('myToken');
-
-		$this->session->method('get')
-			->willReturnMap([
-				['public_link_authenticate_redirect', json_encode(['foo' => 'bar'])],
-			]);
-
-		$this->urlGenerator->method('linkToRoute')
-			->willReturn('myLink!');
-
-		$result = $this->controller->authenticate('password');
-		$this->assertInstanceOf(RedirectResponse::class, $result);
-		$this->assertSame('myLink!', $result->getRedirectURL());
-	}
-
-	public function testAuthenticateInvalidPassword(): void {
-		$this->controller->setToken('token');
-		$this->controller->method('isPasswordProtected')
-			->willReturn(true);
-
-		$this->controller->method('verifyPassword')
-			->with('password')
-			->willReturn(false);
-
-		$this->controller->expects($this->once())
-			->method('authFailed');
-
-		$expects = new TemplateResponse('core', 'publicshareauth', ['wrongpw' => true], 'guest');
-		$expects->throttle();
-
-		$result = $this->controller->authenticate('password');
-
-		$this->assertEquals($expects, $result);
-	}
-
-	public function testAuthenticateValidPassword(): void {
-		$this->controller->setToken('token');
-		$this->controller->method('isPasswordProtected')
-			->willReturn(true);
-		$this->controller->method('verifyPassword')
-			->with('password')
-			->willReturn(true);
-		$this->controller->method('getPasswordHash')
-			->willReturn('hash');
-
-		$this->session->expects($this->once())
-			->method('regenerateId');
-		$this->session->method('get')
-			->willReturnMap([
-				['public_link_authenticate_redirect', json_encode(['foo' => 'bar'])],
-			]);
-
-		$tokenSet = false;
-		$hashSet = false;
-		$this->session
-			->method('set')
-			->willReturnCallback(function ($key, $value) use (&$tokenSet, &$hashSet) {
-				if ($key === 'public_link_authenticated_token' && $value === 'token') {
-					$tokenSet = true;
-					return true;
-				}
-				if ($key === 'public_link_authenticated_password_hash' && $value === 'hash') {
-					$hashSet = true;
-					return true;
-				}
-				return false;
-			});
-
-		$this->urlGenerator->method('linkToRoute')
-			->willReturn('myLink!');
-
-		$result = $this->controller->authenticate('password');
-		$this->assertInstanceOf(RedirectResponse::class, $result);
-		$this->assertSame('myLink!', $result->getRedirectURL());
-		$this->assertTrue($tokenSet);
-		$this->assertTrue($hashSet);
-	}
+    private IRequest&MockObject $request;
+    private ISession&MockObject $session;
+    private IURLGenerator&MockObject $urlGenerator;
+    private AuthPublicShareController&MockObject $controller;
+
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->request = $this->createMock(IRequest::class);
+        $this->session = $this->createMock(ISession::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+
+        $this->controller = $this->getMockBuilder(AuthPublicShareController::class)
+            ->setConstructorArgs([
+                'app',
+                $this->request,
+                $this->session,
+                $this->urlGenerator
+            ])->onlyMethods([
+                'authFailed',
+                'getPasswordHash',
+                'isAuthenticated',
+                'isPasswordProtected',
+                'isValidToken',
+                'showShare',
+                'verifyPassword',
+                'validateIdentity',
+                'generatePassword'
+            ])->getMock();
+    }
+
+    public function testShowAuthenticate(): void {
+        $expects = new TemplateResponse('core', 'publicshareauth', [], 'guest');
+
+        $this->assertEquals($expects, $this->controller->showAuthenticate());
+    }
+
+    public function testAuthenticateAuthenticated(): void {
+        $this->controller->method('isAuthenticated')
+            ->willReturn(true);
+
+        $this->controller->setToken('myToken');
+
+        $this->session->method('get')
+            ->willReturnMap([
+                ['public_link_authenticate_redirect', json_encode(['foo' => 'bar'])],
+            ]);
+
+        $this->urlGenerator->method('linkToRoute')
+            ->willReturn('myLink!');
+
+        $result = $this->controller->authenticate('password');
+        $this->assertInstanceOf(RedirectResponse::class, $result);
+        $this->assertSame('myLink!', $result->getRedirectURL());
+    }
+
+    public function testAuthenticateInvalidPassword(): void {
+        $this->controller->setToken('token');
+        $this->controller->method('isPasswordProtected')
+            ->willReturn(true);
+
+        $this->controller->method('verifyPassword')
+            ->with('password')
+            ->willReturn(false);
+
+        $this->controller->expects($this->once())
+            ->method('authFailed');
+
+        $expects = new TemplateResponse('core', 'publicshareauth', ['wrongpw' => true], 'guest');
+        $expects->throttle();
+
+        $result = $this->controller->authenticate('password');
+
+        $this->assertEquals($expects, $result);
+    }
+
+    public function testAuthenticateValidPassword(): void {
+        $this->controller->setToken('token');
+        $this->controller->method('isPasswordProtected')
+            ->willReturn(true);
+        $this->controller->method('verifyPassword')
+            ->with('password')
+            ->willReturn(true);
+        $this->controller->method('getPasswordHash')
+            ->willReturn('hash');
+
+        $this->session->expects($this->once())
+            ->method('regenerateId');
+        $this->session->method('get')
+            ->willReturnMap([
+                ['public_link_authenticate_redirect', json_encode(['foo' => 'bar'])],
+            ]);
+
+        $tokenSet = false;
+        $hashSet = false;
+        $this->session
+            ->method('set')
+            ->willReturnCallback(function ($key, $value) use (&$tokenSet, &$hashSet) {
+                if ($key === 'public_link_authenticated_token' && $value === 'token') {
+                    $tokenSet = true;
+                    return true;
+                }
+                if ($key === 'public_link_authenticated_password_hash' && $value === 'hash') {
+                    $hashSet = true;
+                    return true;
+                }
+                return false;
+            });
+
+        $this->urlGenerator->method('linkToRoute')
+            ->willReturn('myLink!');
+
+        $result = $this->controller->authenticate('password');
+        $this->assertInstanceOf(RedirectResponse::class, $result);
+        $this->assertSame('myLink!', $result->getRedirectURL());
+        $this->assertTrue($tokenSet);
+        $this->assertTrue($hashSet);
+    }
 }

tests/lib/AppFramework/Controller/ControllerTest.php

Indentation +86 added lines, -86 removed lines

@@ -17,118 +17,118 @@
 use OCP\IRequestId;
 
 class ChildController extends Controller {
-	public function __construct(string $appName, IRequest $request) {
-		parent::__construct($appName, $request);
-		$this->registerResponder('tom', function ($respone) {
-			return 'hi';
-		});
-	}
-
-	public function custom($in) {
-		$this->registerResponder('json', function ($response) {
-			return new JSONResponse([strlen($response)]);
-		});
-
-		return $in;
-	}
-
-	public function customDataResponse(mixed $in): DataResponse {
-		$response = new DataResponse($in, 300);
-		$response->addHeader('test', 'something');
-		return $response;
-	}
+    public function __construct(string $appName, IRequest $request) {
+        parent::__construct($appName, $request);
+        $this->registerResponder('tom', function ($respone) {
+            return 'hi';
+        });
+    }
+
+    public function custom($in) {
+        $this->registerResponder('json', function ($response) {
+            return new JSONResponse([strlen($response)]);
+        });
+
+        return $in;
+    }
+
+    public function customDataResponse(mixed $in): DataResponse {
+        $response = new DataResponse($in, 300);
+        $response->addHeader('test', 'something');
+        return $response;
+    }
 };
 
 class ControllerTest extends \Test\TestCase {
-	private Controller $controller;
-	private Request $request;
+    private Controller $controller;
+    private Request $request;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$request = new Request(
-			[
-				'get' => ['name' => 'John Q. Public', 'nickname' => 'Joey'],
-				'post' => ['name' => 'Jane Doe', 'nickname' => 'Janey'],
-				'urlParams' => ['name' => 'Johnny Weissmüller'],
-				'files' => ['file' => 'filevalue'],
-				'env' => ['PATH' => 'daheim'],
-				'session' => ['sezession' => 'kein'],
-				'method' => 'hi',
-			],
-			$this->createMock(IRequestId::class),
-			$this->createMock(IConfig::class)
-		);
+        $request = new Request(
+            [
+                'get' => ['name' => 'John Q. Public', 'nickname' => 'Joey'],
+                'post' => ['name' => 'Jane Doe', 'nickname' => 'Janey'],
+                'urlParams' => ['name' => 'Johnny Weissmüller'],
+                'files' => ['file' => 'filevalue'],
+                'env' => ['PATH' => 'daheim'],
+                'session' => ['sezession' => 'kein'],
+                'method' => 'hi',
+            ],
+            $this->createMock(IRequestId::class),
+            $this->createMock(IConfig::class)
+        );
 
-		$this->controller = new ChildController('apptemplate_advanced', $request);
-		$this->overwriteService(IRequest::class, $request);
-		$this->request = $request;
-	}
+        $this->controller = new ChildController('apptemplate_advanced', $request);
+        $this->overwriteService(IRequest::class, $request);
+        $this->request = $request;
+    }
 
 
-	public function testFormatResonseInvalidFormat(): void {
-		$this->expectException(\DomainException::class);
+    public function testFormatResonseInvalidFormat(): void {
+        $this->expectException(\DomainException::class);
 
-		$this->controller->buildResponse(null, 'test');
-	}
+        $this->controller->buildResponse(null, 'test');
+    }
 
 
-	public function testFormat(): void {
-		$response = $this->controller->buildResponse(['hi'], 'json');
+    public function testFormat(): void {
+        $response = $this->controller->buildResponse(['hi'], 'json');
 
-		$this->assertEquals(['hi'], $response->getData());
-	}
+        $this->assertEquals(['hi'], $response->getData());
+    }
 
 
-	public function testFormatDataResponseJSON(): void {
-		$expectedHeaders = [
-			'test' => 'something',
-			'Cache-Control' => 'no-cache, no-store, must-revalidate',
-			'Content-Type' => 'application/json; charset=utf-8',
-			'Content-Security-Policy' => "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'",
-			'Feature-Policy' => "autoplay 'none';camera 'none';fullscreen 'none';geolocation 'none';microphone 'none';payment 'none'",
-			'X-Request-Id' => $this->request->getId(),
-			'X-Robots-Tag' => 'noindex, nofollow',
-		];
+    public function testFormatDataResponseJSON(): void {
+        $expectedHeaders = [
+            'test' => 'something',
+            'Cache-Control' => 'no-cache, no-store, must-revalidate',
+            'Content-Type' => 'application/json; charset=utf-8',
+            'Content-Security-Policy' => "default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'",
+            'Feature-Policy' => "autoplay 'none';camera 'none';fullscreen 'none';geolocation 'none';microphone 'none';payment 'none'",
+            'X-Request-Id' => $this->request->getId(),
+            'X-Robots-Tag' => 'noindex, nofollow',
+        ];
 
-		$response = $this->controller->customDataResponse(['hi']);
-		$response = $this->controller->buildResponse($response, 'json');
+        $response = $this->controller->customDataResponse(['hi']);
+        $response = $this->controller->buildResponse($response, 'json');
 
-		$this->assertEquals(['hi'], $response->getData());
-		$this->assertEquals(300, $response->getStatus());
-		$this->assertEquals($expectedHeaders, $response->getHeaders());
-	}
+        $this->assertEquals(['hi'], $response->getData());
+        $this->assertEquals(300, $response->getStatus());
+        $this->assertEquals($expectedHeaders, $response->getHeaders());
+    }
 
 
-	public function testCustomFormatter(): void {
-		$response = $this->controller->custom('hi');
-		$response = $this->controller->buildResponse($response, 'json');
+    public function testCustomFormatter(): void {
+        $response = $this->controller->custom('hi');
+        $response = $this->controller->buildResponse($response, 'json');
 
-		$this->assertEquals([2], $response->getData());
-	}
+        $this->assertEquals([2], $response->getData());
+    }
 
 
-	public function testDefaultResponderToJSON(): void {
-		$responder = $this->controller->getResponderByHTTPHeader('*/*');
+    public function testDefaultResponderToJSON(): void {
+        $responder = $this->controller->getResponderByHTTPHeader('*/*');
 
-		$this->assertEquals('json', $responder);
-	}
+        $this->assertEquals('json', $responder);
+    }
 
 
-	public function testResponderAcceptHeaderParsed(): void {
-		$responder = $this->controller->getResponderByHTTPHeader(
-			'*/*, application/tom, application/json'
-		);
+    public function testResponderAcceptHeaderParsed(): void {
+        $responder = $this->controller->getResponderByHTTPHeader(
+            '*/*, application/tom, application/json'
+        );
 
-		$this->assertEquals('tom', $responder);
-	}
+        $this->assertEquals('tom', $responder);
+    }
 
 
-	public function testResponderAcceptHeaderParsedUpperCase(): void {
-		$responder = $this->controller->getResponderByHTTPHeader(
-			'*/*, apPlication/ToM, application/json'
-		);
+    public function testResponderAcceptHeaderParsedUpperCase(): void {
+        $responder = $this->controller->getResponderByHTTPHeader(
+            '*/*, apPlication/ToM, application/json'
+        );
 
-		$this->assertEquals('tom', $responder);
-	}
+        $this->assertEquals('tom', $responder);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -19,13 +19,13 @@
 class ChildController extends Controller {
 	public function __construct(string $appName, IRequest $request) {
 		parent::__construct($appName, $request);
-		$this->registerResponder('tom', function ($respone) {
+		$this->registerResponder('tom', function($respone) {
 			return 'hi';
 		});
 	}
 
 	public function custom($in) {
-		$this->registerResponder('json', function ($response) {
+		$this->registerResponder('json', function($response) {
 			return new JSONResponse([strlen($response)]);
 		});