nextcloud / server

core/Command/Encryption/Status.php

Indentation +19 added lines, -19 removed lines

@@ -27,26 +27,26 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Status extends Base {
-	public function __construct(
-		protected IManager $encryptionManager,
-	) {
-		parent::__construct();
-	}
+    public function __construct(
+        protected IManager $encryptionManager,
+    ) {
+        parent::__construct();
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('encryption:status')
-			->setDescription('Lists the current status of encryption')
-		;
-	}
+        $this
+            ->setName('encryption:status')
+            ->setDescription('Lists the current status of encryption')
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$this->writeArrayInOutputFormat($input, $output, [
-			'enabled' => $this->encryptionManager->isEnabled(),
-			'defaultModule' => $this->encryptionManager->getDefaultEncryptionModuleId(),
-		]);
-		return 0;
-	}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $this->writeArrayInOutputFormat($input, $output, [
+            'enabled' => $this->encryptionManager->isEnabled(),
+            'defaultModule' => $this->encryptionManager->getDefaultEncryptionModuleId(),
+        ]);
+        return 0;
+    }
 }

core/Command/Encryption/ShowKeyStorageRoot.php

Indentation +17 added lines, -17 removed lines

@@ -29,25 +29,25 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ShowKeyStorageRoot extends Command {
-	public function __construct(
-		protected Util $util,
-	) {
-		parent::__construct();
-	}
+    public function __construct(
+        protected Util $util,
+    ) {
+        parent::__construct();
+    }
 
-	protected function configure() {
-		parent::configure();
-		$this
-			->setName('encryption:show-key-storage-root')
-			->setDescription('Show current key storage root');
-	}
+    protected function configure() {
+        parent::configure();
+        $this
+            ->setName('encryption:show-key-storage-root')
+            ->setDescription('Show current key storage root');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$currentRoot = $this->util->getKeyStorageRoot();
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $currentRoot = $this->util->getKeyStorageRoot();
 
-		$rootDescription = $currentRoot !== '' ? $currentRoot : 'default storage location (data/)';
+        $rootDescription = $currentRoot !== '' ? $currentRoot : 'default storage location (data/)';
 
-		$output->writeln("Current key storage root:  <info>$rootDescription</info>");
-		return 0;
-	}
+        $output->writeln("Current key storage root:  <info>$rootDescription</info>");
+        return 0;
+    }
 }

tests/Core/Controller/CssControllerTest.php

Indentation +146 added lines, -146 removed lines

@@ -21,150 +21,150 @@
 use Test\TestCase;
 
 class CssControllerTest extends TestCase {
-	/** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */
-	private $appData;
-
-	/** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
-	private $request;
-
-	/** @var CssController */
-	private $controller;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		/** @var Factory|\PHPUnit\Framework\MockObject\MockObject $factory */
-		$factory = $this->createMock(Factory::class);
-		$this->appData = $this->createMock(AppData::class);
-		$factory->expects($this->once())
-			->method('get')
-			->with('css')
-			->willReturn($this->appData);
-
-		/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject $timeFactory */
-		$timeFactory = $this->createMock(ITimeFactory::class);
-		$timeFactory->method('getTime')
-			->willReturn(1337);
-
-		$this->request = $this->createMock(IRequest::class);
-
-		$this->controller = new CssController(
-			'core',
-			$this->request,
-			$factory,
-			$timeFactory
-		);
-	}
-
-	public function testNoCssFolderForApp(): void {
-		$this->appData->method('getFolder')
-			->with('myapp')
-			->willThrowException(new NotFoundException());
-
-		$result = $this->controller->getCss('file.css', 'myapp');
-
-		$this->assertInstanceOf(NotFoundResponse::class, $result);
-	}
-
-
-	public function testNoCssFile(): void {
-		$folder = $this->createMock(ISimpleFolder::class);
-		$this->appData->method('getFolder')
-			->with('myapp')
-			->willReturn($folder);
-
-		$folder->method('getFile')
-			->willThrowException(new NotFoundException());
-
-		$result = $this->controller->getCss('file.css', 'myapp');
-
-		$this->assertInstanceOf(NotFoundResponse::class, $result);
-	}
-
-	public function testGetFile(): void {
-		$folder = $this->createMock(ISimpleFolder::class);
-		$file = $this->createMock(ISimpleFile::class);
-		$file->method('getName')->willReturn('my name');
-		$file->method('getMTime')->willReturn(42);
-		$this->appData->method('getFolder')
-			->with('myapp')
-			->willReturn($folder);
-
-		$folder->method('getFile')
-			->with('file.css')
-			->willReturn($file);
-
-		$expected = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'text/css']);
-		$expected->addHeader('Cache-Control', 'max-age=31536000, immutable');
-		$expires = new \DateTime();
-		$expires->setTimestamp(1337);
-		$expires->add(new \DateInterval('PT31536000S'));
-		$expected->addHeader('Expires', $expires->format(\DateTime::RFC1123));
-
-		$result = $this->controller->getCss('file.css', 'myapp');
-		$this->assertEquals($expected, $result);
-	}
-
-	public function testGetGzipFile(): void {
-		$folder = $this->createMock(ISimpleFolder::class);
-		$gzipFile = $this->createMock(ISimpleFile::class);
-		$gzipFile->method('getName')->willReturn('my name');
-		$gzipFile->method('getMTime')->willReturn(42);
-		$this->appData->method('getFolder')
-			->with('myapp')
-			->willReturn($folder);
-
-		$folder->method('getFile')
-			->with('file.css.gzip')
-			->willReturn($gzipFile);
-
-		$this->request->method('getHeader')
-			->with('Accept-Encoding')
-			->willReturn('gzip, deflate');
-
-		$expected = new FileDisplayResponse($gzipFile, Http::STATUS_OK, ['Content-Type' => 'text/css']);
-		$expected->addHeader('Content-Encoding', 'gzip');
-		$expected->addHeader('Cache-Control', 'max-age=31536000, immutable');
-		$expires = new \DateTime();
-		$expires->setTimestamp(1337);
-		$expires->add(new \DateInterval('PT31536000S'));
-		$expected->addHeader('Expires', $expires->format(\DateTime::RFC1123));
-
-		$result = $this->controller->getCss('file.css', 'myapp');
-		$this->assertEquals($expected, $result);
-	}
-
-	public function testGetGzipFileNotFound(): void {
-		$folder = $this->createMock(ISimpleFolder::class);
-		$file = $this->createMock(ISimpleFile::class);
-		$file->method('getName')->willReturn('my name');
-		$file->method('getMTime')->willReturn(42);
-		$this->appData->method('getFolder')
-			->with('myapp')
-			->willReturn($folder);
-
-		$folder->method('getFile')
-			->willReturnCallback(
-				function ($fileName) use ($file) {
-					if ($fileName === 'file.css') {
-						return $file;
-					}
-					throw new NotFoundException();
-				}
-			);
-
-		$this->request->method('getHeader')
-			->with('Accept-Encoding')
-			->willReturn('gzip, deflate');
-
-		$expected = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'text/css']);
-		$expected->addHeader('Cache-Control', 'max-age=31536000, immutable');
-		$expires = new \DateTime();
-		$expires->setTimestamp(1337);
-		$expires->add(new \DateInterval('PT31536000S'));
-		$expected->addHeader('Expires', $expires->format(\DateTime::RFC1123));
-
-		$result = $this->controller->getCss('file.css', 'myapp');
-		$this->assertEquals($expected, $result);
-	}
+    /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */
+    private $appData;
+
+    /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
+    private $request;
+
+    /** @var CssController */
+    private $controller;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        /** @var Factory|\PHPUnit\Framework\MockObject\MockObject $factory */
+        $factory = $this->createMock(Factory::class);
+        $this->appData = $this->createMock(AppData::class);
+        $factory->expects($this->once())
+            ->method('get')
+            ->with('css')
+            ->willReturn($this->appData);
+
+        /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject $timeFactory */
+        $timeFactory = $this->createMock(ITimeFactory::class);
+        $timeFactory->method('getTime')
+            ->willReturn(1337);
+
+        $this->request = $this->createMock(IRequest::class);
+
+        $this->controller = new CssController(
+            'core',
+            $this->request,
+            $factory,
+            $timeFactory
+        );
+    }
+
+    public function testNoCssFolderForApp(): void {
+        $this->appData->method('getFolder')
+            ->with('myapp')
+            ->willThrowException(new NotFoundException());
+
+        $result = $this->controller->getCss('file.css', 'myapp');
+
+        $this->assertInstanceOf(NotFoundResponse::class, $result);
+    }
+
+
+    public function testNoCssFile(): void {
+        $folder = $this->createMock(ISimpleFolder::class);
+        $this->appData->method('getFolder')
+            ->with('myapp')
+            ->willReturn($folder);
+
+        $folder->method('getFile')
+            ->willThrowException(new NotFoundException());
+
+        $result = $this->controller->getCss('file.css', 'myapp');
+
+        $this->assertInstanceOf(NotFoundResponse::class, $result);
+    }
+
+    public function testGetFile(): void {
+        $folder = $this->createMock(ISimpleFolder::class);
+        $file = $this->createMock(ISimpleFile::class);
+        $file->method('getName')->willReturn('my name');
+        $file->method('getMTime')->willReturn(42);
+        $this->appData->method('getFolder')
+            ->with('myapp')
+            ->willReturn($folder);
+
+        $folder->method('getFile')
+            ->with('file.css')
+            ->willReturn($file);
+
+        $expected = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'text/css']);
+        $expected->addHeader('Cache-Control', 'max-age=31536000, immutable');
+        $expires = new \DateTime();
+        $expires->setTimestamp(1337);
+        $expires->add(new \DateInterval('PT31536000S'));
+        $expected->addHeader('Expires', $expires->format(\DateTime::RFC1123));
+
+        $result = $this->controller->getCss('file.css', 'myapp');
+        $this->assertEquals($expected, $result);
+    }
+
+    public function testGetGzipFile(): void {
+        $folder = $this->createMock(ISimpleFolder::class);
+        $gzipFile = $this->createMock(ISimpleFile::class);
+        $gzipFile->method('getName')->willReturn('my name');
+        $gzipFile->method('getMTime')->willReturn(42);
+        $this->appData->method('getFolder')
+            ->with('myapp')
+            ->willReturn($folder);
+
+        $folder->method('getFile')
+            ->with('file.css.gzip')
+            ->willReturn($gzipFile);
+
+        $this->request->method('getHeader')
+            ->with('Accept-Encoding')
+            ->willReturn('gzip, deflate');
+
+        $expected = new FileDisplayResponse($gzipFile, Http::STATUS_OK, ['Content-Type' => 'text/css']);
+        $expected->addHeader('Content-Encoding', 'gzip');
+        $expected->addHeader('Cache-Control', 'max-age=31536000, immutable');
+        $expires = new \DateTime();
+        $expires->setTimestamp(1337);
+        $expires->add(new \DateInterval('PT31536000S'));
+        $expected->addHeader('Expires', $expires->format(\DateTime::RFC1123));
+
+        $result = $this->controller->getCss('file.css', 'myapp');
+        $this->assertEquals($expected, $result);
+    }
+
+    public function testGetGzipFileNotFound(): void {
+        $folder = $this->createMock(ISimpleFolder::class);
+        $file = $this->createMock(ISimpleFile::class);
+        $file->method('getName')->willReturn('my name');
+        $file->method('getMTime')->willReturn(42);
+        $this->appData->method('getFolder')
+            ->with('myapp')
+            ->willReturn($folder);
+
+        $folder->method('getFile')
+            ->willReturnCallback(
+                function ($fileName) use ($file) {
+                    if ($fileName === 'file.css') {
+                        return $file;
+                    }
+                    throw new NotFoundException();
+                }
+            );
+
+        $this->request->method('getHeader')
+            ->with('Accept-Encoding')
+            ->willReturn('gzip, deflate');
+
+        $expected = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'text/css']);
+        $expected->addHeader('Cache-Control', 'max-age=31536000, immutable');
+        $expires = new \DateTime();
+        $expires->setTimestamp(1337);
+        $expires->add(new \DateInterval('PT31536000S'));
+        $expected->addHeader('Expires', $expires->format(\DateTime::RFC1123));
+
+        $result = $this->controller->getCss('file.css', 'myapp');
+        $this->assertEquals($expected, $result);
+    }
 }

tests/Core/Controller/CSRFTokenControllerTest.php

Indentation +31 added lines, -31 removed lines

@@ -16,47 +16,47 @@
 use Test\TestCase;
 
 class CSRFTokenControllerTest extends TestCase {
-	/** @var CSRFTokenController */
-	private $controller;
+    /** @var CSRFTokenController */
+    private $controller;
 
-	/** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
-	private $request;
+    /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
+    private $request;
 
-	/** @var CsrfTokenManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $tokenManager;
+    /** @var CsrfTokenManager|\PHPUnit\Framework\MockObject\MockObject */
+    private $tokenManager;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->request = $this->createMock(IRequest::class);
-		$this->tokenManager = $this->createMock(CsrfTokenManager::class);
+        $this->request = $this->createMock(IRequest::class);
+        $this->tokenManager = $this->createMock(CsrfTokenManager::class);
 
-		$this->controller = new CSRFTokenController('core', $this->request,
-			$this->tokenManager);
-	}
+        $this->controller = new CSRFTokenController('core', $this->request,
+            $this->tokenManager);
+    }
 
-	public function testGetToken(): void {
-		$this->request->method('passesStrictCookieCheck')->willReturn(true);
+    public function testGetToken(): void {
+        $this->request->method('passesStrictCookieCheck')->willReturn(true);
 
-		$token = $this->createMock(CsrfToken::class);
-		$this->tokenManager->method('getToken')->willReturn($token);
-		$token->method('getEncryptedValue')->willReturn('toktok123');
+        $token = $this->createMock(CsrfToken::class);
+        $this->tokenManager->method('getToken')->willReturn($token);
+        $token->method('getEncryptedValue')->willReturn('toktok123');
 
-		$response = $this->controller->index();
+        $response = $this->controller->index();
 
-		$this->assertInstanceOf(JSONResponse::class, $response);
-		$this->assertSame(Http::STATUS_OK, $response->getStatus());
-		$this->assertEquals([
-			'token' => 'toktok123'
-		], $response->getData());
-	}
+        $this->assertInstanceOf(JSONResponse::class, $response);
+        $this->assertSame(Http::STATUS_OK, $response->getStatus());
+        $this->assertEquals([
+            'token' => 'toktok123'
+        ], $response->getData());
+    }
 
-	public function testGetTokenNoStrictSameSiteCookie(): void {
-		$this->request->method('passesStrictCookieCheck')->willReturn(false);
+    public function testGetTokenNoStrictSameSiteCookie(): void {
+        $this->request->method('passesStrictCookieCheck')->willReturn(false);
 
-		$response = $this->controller->index();
+        $response = $this->controller->index();
 
-		$this->assertInstanceOf(JSONResponse::class, $response);
-		$this->assertSame(Http::STATUS_FORBIDDEN, $response->getStatus());
-	}
+        $this->assertInstanceOf(JSONResponse::class, $response);
+        $this->assertSame(Http::STATUS_FORBIDDEN, $response->getStatus());
+    }
 }

tests/Core/Controller/UserControllerTest.php

Indentation +42 added lines, -42 removed lines

@@ -14,46 +14,46 @@
 use Test\TestCase;
 
 class UserControllerTest extends TestCase {
-	/** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $userManager;
-
-	/** @var UserController */
-	private $controller;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->userManager = $this->createMock(IUserManager::class);
-		$this->controller = new UserController(
-			'core',
-			$this->createMock(IRequest::class),
-			$this->userManager
-		);
-	}
-
-	public function testGetDisplayNames(): void {
-		$user = $this->createMock(IUser::class);
-		$user->method('getDisplayName')
-			->willReturn('FooDisplay Name');
-
-		$this->userManager
-			->method('get')
-			->willReturnCallback(function ($uid) use ($user) {
-				if ($uid === 'foo') {
-					return $user;
-				}
-				return null;
-			});
-
-		$expected = new JSONResponse([
-			'users' => [
-				'foo' => 'FooDisplay Name',
-				'bar' => 'bar',
-			],
-			'status' => 'success'
-		]);
-
-		$result = $this->controller->getDisplayNames(['foo', 'bar']);
-		$this->assertEquals($expected, $result);
-	}
+    /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */
+    private $userManager;
+
+    /** @var UserController */
+    private $controller;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->userManager = $this->createMock(IUserManager::class);
+        $this->controller = new UserController(
+            'core',
+            $this->createMock(IRequest::class),
+            $this->userManager
+        );
+    }
+
+    public function testGetDisplayNames(): void {
+        $user = $this->createMock(IUser::class);
+        $user->method('getDisplayName')
+            ->willReturn('FooDisplay Name');
+
+        $this->userManager
+            ->method('get')
+            ->willReturnCallback(function ($uid) use ($user) {
+                if ($uid === 'foo') {
+                    return $user;
+                }
+                return null;
+            });
+
+        $expected = new JSONResponse([
+            'users' => [
+                'foo' => 'FooDisplay Name',
+                'bar' => 'bar',
+            ],
+            'status' => 'success'
+        ]);
+
+        $result = $this->controller->getDisplayNames(['foo', 'bar']);
+        $this->assertEquals($expected, $result);
+    }
 }

tests/Core/Controller/JsControllerTest.php

Indentation +146 added lines, -146 removed lines

@@ -21,150 +21,150 @@
 use Test\TestCase;
 
 class JsControllerTest extends TestCase {
-	/** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */
-	private $appData;
-
-	/** @var JsController */
-	private $controller;
-
-	/** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
-	private $request;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		/** @var Factory|\PHPUnit\Framework\MockObject\MockObject $factory */
-		$factory = $this->createMock(Factory::class);
-		$this->appData = $this->createMock(AppData::class);
-		$factory->expects($this->once())
-			->method('get')
-			->with('js')
-			->willReturn($this->appData);
-
-		/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject $timeFactory */
-		$timeFactory = $this->createMock(ITimeFactory::class);
-		$timeFactory->method('getTime')
-			->willReturn(1337);
-
-		$this->request = $this->createMock(IRequest::class);
-
-		$this->controller = new JsController(
-			'core',
-			$this->request,
-			$factory,
-			$timeFactory
-		);
-	}
-
-	public function testNoCssFolderForApp(): void {
-		$this->appData->method('getFolder')
-			->with('myapp')
-			->willThrowException(new NotFoundException());
-
-		$result = $this->controller->getJs('file.css', 'myapp');
-
-		$this->assertInstanceOf(NotFoundResponse::class, $result);
-	}
-
-
-	public function testNoCssFile(): void {
-		$folder = $this->createMock(ISimpleFolder::class);
-		$this->appData->method('getFolder')
-			->with('myapp')
-			->willReturn($folder);
-
-		$folder->method('getFile')
-			->willThrowException(new NotFoundException());
-
-		$result = $this->controller->getJs('file.css', 'myapp');
-
-		$this->assertInstanceOf(NotFoundResponse::class, $result);
-	}
-
-	public function testGetFile(): void {
-		$folder = $this->createMock(ISimpleFolder::class);
-		$file = $this->createMock(ISimpleFile::class);
-		$file->method('getName')->willReturn('my name');
-		$file->method('getMTime')->willReturn(42);
-		$this->appData->method('getFolder')
-			->with('myapp')
-			->willReturn($folder);
-
-		$folder->method('getFile')
-			->with('file.js')
-			->willReturn($file);
-
-		$expected = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'application/javascript']);
-		$expected->addHeader('Cache-Control', 'max-age=31536000, immutable');
-		$expires = new \DateTime();
-		$expires->setTimestamp(1337);
-		$expires->add(new \DateInterval('PT31536000S'));
-		$expected->addHeader('Expires', $expires->format(\DateTime::RFC1123));
-
-		$result = $this->controller->getJs('file.js', 'myapp');
-		$this->assertEquals($expected, $result);
-	}
-
-	public function testGetGzipFile(): void {
-		$folder = $this->createMock(ISimpleFolder::class);
-		$gzipFile = $this->createMock(ISimpleFile::class);
-		$gzipFile->method('getName')->willReturn('my name');
-		$gzipFile->method('getMTime')->willReturn(42);
-		$this->appData->method('getFolder')
-			->with('myapp')
-			->willReturn($folder);
-
-		$folder->method('getFile')
-			->with('file.js.gzip')
-			->willReturn($gzipFile);
-
-		$this->request->method('getHeader')
-			->with('Accept-Encoding')
-			->willReturn('gzip, deflate');
-
-		$expected = new FileDisplayResponse($gzipFile, Http::STATUS_OK, ['Content-Type' => 'application/javascript']);
-		$expected->addHeader('Content-Encoding', 'gzip');
-		$expected->addHeader('Cache-Control', 'max-age=31536000, immutable');
-		$expires = new \DateTime();
-		$expires->setTimestamp(1337);
-		$expires->add(new \DateInterval('PT31536000S'));
-		$expected->addHeader('Expires', $expires->format(\DateTime::RFC1123));
-
-		$result = $this->controller->getJs('file.js', 'myapp');
-		$this->assertEquals($expected, $result);
-	}
-
-	public function testGetGzipFileNotFound(): void {
-		$folder = $this->createMock(ISimpleFolder::class);
-		$file = $this->createMock(ISimpleFile::class);
-		$file->method('getName')->willReturn('my name');
-		$file->method('getMTime')->willReturn(42);
-		$this->appData->method('getFolder')
-			->with('myapp')
-			->willReturn($folder);
-
-		$folder->method('getFile')
-			->willReturnCallback(
-				function ($fileName) use ($file) {
-					if ($fileName === 'file.js') {
-						return $file;
-					}
-					throw new NotFoundException();
-				}
-			);
-
-		$this->request->method('getHeader')
-			->with('Accept-Encoding')
-			->willReturn('gzip, deflate');
-
-		$expected = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'application/javascript']);
-		$expected->addHeader('Cache-Control', 'max-age=31536000, immutable');
-		$expires = new \DateTime();
-		$expires->setTimestamp(1337);
-		$expires->add(new \DateInterval('PT31536000S'));
-		$expected->addHeader('Expires', $expires->format(\DateTime::RFC1123));
-
-		$result = $this->controller->getJs('file.js', 'myapp');
-		$this->assertEquals($expected, $result);
-	}
+    /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */
+    private $appData;
+
+    /** @var JsController */
+    private $controller;
+
+    /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
+    private $request;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        /** @var Factory|\PHPUnit\Framework\MockObject\MockObject $factory */
+        $factory = $this->createMock(Factory::class);
+        $this->appData = $this->createMock(AppData::class);
+        $factory->expects($this->once())
+            ->method('get')
+            ->with('js')
+            ->willReturn($this->appData);
+
+        /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject $timeFactory */
+        $timeFactory = $this->createMock(ITimeFactory::class);
+        $timeFactory->method('getTime')
+            ->willReturn(1337);
+
+        $this->request = $this->createMock(IRequest::class);
+
+        $this->controller = new JsController(
+            'core',
+            $this->request,
+            $factory,
+            $timeFactory
+        );
+    }
+
+    public function testNoCssFolderForApp(): void {
+        $this->appData->method('getFolder')
+            ->with('myapp')
+            ->willThrowException(new NotFoundException());
+
+        $result = $this->controller->getJs('file.css', 'myapp');
+
+        $this->assertInstanceOf(NotFoundResponse::class, $result);
+    }
+
+
+    public function testNoCssFile(): void {
+        $folder = $this->createMock(ISimpleFolder::class);
+        $this->appData->method('getFolder')
+            ->with('myapp')
+            ->willReturn($folder);
+
+        $folder->method('getFile')
+            ->willThrowException(new NotFoundException());
+
+        $result = $this->controller->getJs('file.css', 'myapp');
+
+        $this->assertInstanceOf(NotFoundResponse::class, $result);
+    }
+
+    public function testGetFile(): void {
+        $folder = $this->createMock(ISimpleFolder::class);
+        $file = $this->createMock(ISimpleFile::class);
+        $file->method('getName')->willReturn('my name');
+        $file->method('getMTime')->willReturn(42);
+        $this->appData->method('getFolder')
+            ->with('myapp')
+            ->willReturn($folder);
+
+        $folder->method('getFile')
+            ->with('file.js')
+            ->willReturn($file);
+
+        $expected = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'application/javascript']);
+        $expected->addHeader('Cache-Control', 'max-age=31536000, immutable');
+        $expires = new \DateTime();
+        $expires->setTimestamp(1337);
+        $expires->add(new \DateInterval('PT31536000S'));
+        $expected->addHeader('Expires', $expires->format(\DateTime::RFC1123));
+
+        $result = $this->controller->getJs('file.js', 'myapp');
+        $this->assertEquals($expected, $result);
+    }
+
+    public function testGetGzipFile(): void {
+        $folder = $this->createMock(ISimpleFolder::class);
+        $gzipFile = $this->createMock(ISimpleFile::class);
+        $gzipFile->method('getName')->willReturn('my name');
+        $gzipFile->method('getMTime')->willReturn(42);
+        $this->appData->method('getFolder')
+            ->with('myapp')
+            ->willReturn($folder);
+
+        $folder->method('getFile')
+            ->with('file.js.gzip')
+            ->willReturn($gzipFile);
+
+        $this->request->method('getHeader')
+            ->with('Accept-Encoding')
+            ->willReturn('gzip, deflate');
+
+        $expected = new FileDisplayResponse($gzipFile, Http::STATUS_OK, ['Content-Type' => 'application/javascript']);
+        $expected->addHeader('Content-Encoding', 'gzip');
+        $expected->addHeader('Cache-Control', 'max-age=31536000, immutable');
+        $expires = new \DateTime();
+        $expires->setTimestamp(1337);
+        $expires->add(new \DateInterval('PT31536000S'));
+        $expected->addHeader('Expires', $expires->format(\DateTime::RFC1123));
+
+        $result = $this->controller->getJs('file.js', 'myapp');
+        $this->assertEquals($expected, $result);
+    }
+
+    public function testGetGzipFileNotFound(): void {
+        $folder = $this->createMock(ISimpleFolder::class);
+        $file = $this->createMock(ISimpleFile::class);
+        $file->method('getName')->willReturn('my name');
+        $file->method('getMTime')->willReturn(42);
+        $this->appData->method('getFolder')
+            ->with('myapp')
+            ->willReturn($folder);
+
+        $folder->method('getFile')
+            ->willReturnCallback(
+                function ($fileName) use ($file) {
+                    if ($fileName === 'file.js') {
+                        return $file;
+                    }
+                    throw new NotFoundException();
+                }
+            );
+
+        $this->request->method('getHeader')
+            ->with('Accept-Encoding')
+            ->willReturn('gzip, deflate');
+
+        $expected = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'application/javascript']);
+        $expected->addHeader('Cache-Control', 'max-age=31536000, immutable');
+        $expires = new \DateTime();
+        $expires->setTimestamp(1337);
+        $expires->add(new \DateInterval('PT31536000S'));
+        $expected->addHeader('Expires', $expires->format(\DateTime::RFC1123));
+
+        $result = $this->controller->getJs('file.js', 'myapp');
+        $this->assertEquals($expected, $result);
+    }
 }

tests/Core/Controller/WellKnownControllerTest.php

Indentation +38 added lines, -38 removed lines

@@ -18,52 +18,52 @@
 use Test\TestCase;
 
 class WellKnownControllerTest extends TestCase {
-	/** @var IRequest|MockObject */
-	private $request;
+    /** @var IRequest|MockObject */
+    private $request;
 
-	/** @var RequestManager|MockObject */
-	private $manager;
+    /** @var RequestManager|MockObject */
+    private $manager;
 
-	/** @var WellKnownController */
-	private $controller;
+    /** @var WellKnownController */
+    private $controller;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->request = $this->createMock(IRequest::class);
-		$this->manager = $this->createMock(RequestManager::class);
+        $this->request = $this->createMock(IRequest::class);
+        $this->manager = $this->createMock(RequestManager::class);
 
-		$this->controller = new WellKnownController(
-			$this->request,
-			$this->manager,
-		);
-	}
+        $this->controller = new WellKnownController(
+            $this->request,
+            $this->manager,
+        );
+    }
 
-	public function testHandleNotProcessed(): void {
-		$httpResponse = $this->controller->handle('nodeinfo');
+    public function testHandleNotProcessed(): void {
+        $httpResponse = $this->controller->handle('nodeinfo');
 
-		self::assertInstanceOf(JSONResponse::class, $httpResponse);
-		self::assertArrayHasKey('X-NEXTCLOUD-WELL-KNOWN', $httpResponse->getHeaders());
-	}
+        self::assertInstanceOf(JSONResponse::class, $httpResponse);
+        self::assertArrayHasKey('X-NEXTCLOUD-WELL-KNOWN', $httpResponse->getHeaders());
+    }
 
-	public function testHandle(): void {
-		$response = $this->createMock(IResponse::class);
-		$jsonResponse = $this->createMock(JSONResponse::class);
-		$response->expects(self::once())
-			->method('toHttpResponse')
-			->willReturn($jsonResponse);
-		$this->manager->expects(self::once())
-			->method('process')
-			->with(
-				'nodeinfo',
-				$this->request
-			)->willReturn($response);
-		$jsonResponse->expects(self::once())
-			->method('addHeader')
-			->willReturnSelf();
+    public function testHandle(): void {
+        $response = $this->createMock(IResponse::class);
+        $jsonResponse = $this->createMock(JSONResponse::class);
+        $response->expects(self::once())
+            ->method('toHttpResponse')
+            ->willReturn($jsonResponse);
+        $this->manager->expects(self::once())
+            ->method('process')
+            ->with(
+                'nodeinfo',
+                $this->request
+            )->willReturn($response);
+        $jsonResponse->expects(self::once())
+            ->method('addHeader')
+            ->willReturnSelf();
 
-		$httpResponse = $this->controller->handle('nodeinfo');
+        $httpResponse = $this->controller->handle('nodeinfo');
 
-		self::assertInstanceOf(JSONResponse::class, $httpResponse);
-	}
+        self::assertInstanceOf(JSONResponse::class, $httpResponse);
+    }
 }

tests/Core/Controller/ContactsMenuControllerTest.php

Indentation +68 added lines, -68 removed lines

@@ -17,72 +17,72 @@
 use Test\TestCase;
 
 class ContactsMenuControllerTest extends TestCase {
-	/** @var IUserSession|MockObject */
-	private $userSession;
-
-	/** @var Manager|MockObject */
-	private $contactsManager;
-
-	private ContactsMenuController $controller;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$request = $this->createMock(IRequest::class);
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->contactsManager = $this->createMock(Manager::class);
-
-		$this->controller = new ContactsMenuController($request, $this->userSession, $this->contactsManager);
-	}
-
-	public function testIndex(): void {
-		$user = $this->createMock(IUser::class);
-		$entries = [
-			$this->createMock(IEntry::class),
-			$this->createMock(IEntry::class),
-		];
-		$this->userSession->expects($this->once())
-			->method('getUser')
-			->willReturn($user);
-		$this->contactsManager->expects($this->once())
-			->method('getEntries')
-			->with($this->equalTo($user), $this->equalTo(null))
-			->willReturn($entries);
-
-		$response = $this->controller->index();
-
-		$this->assertEquals($entries, $response);
-	}
-
-	public function testFindOne(): void {
-		$user = $this->createMock(IUser::class);
-		$entry = $this->createMock(IEntry::class);
-		$this->userSession->expects($this->once())
-			->method('getUser')
-			->willReturn($user);
-		$this->contactsManager->expects($this->once())
-			->method('findOne')
-			->with($this->equalTo($user), $this->equalTo(42), $this->equalTo('test-search-phrase'))
-			->willReturn($entry);
-
-		$response = $this->controller->findOne(42, 'test-search-phrase');
-
-		$this->assertEquals($entry, $response);
-	}
-
-	public function testFindOne404(): void {
-		$user = $this->createMock(IUser::class);
-		$this->userSession->expects($this->once())
-			->method('getUser')
-			->willReturn($user);
-		$this->contactsManager->expects($this->once())
-			->method('findOne')
-			->with($this->equalTo($user), $this->equalTo(42), $this->equalTo('test-search-phrase'))
-			->willReturn(null);
-
-		$response = $this->controller->findOne(42, 'test-search-phrase');
-
-		$this->assertEquals([], $response->getData());
-		$this->assertEquals(404, $response->getStatus());
-	}
+    /** @var IUserSession|MockObject */
+    private $userSession;
+
+    /** @var Manager|MockObject */
+    private $contactsManager;
+
+    private ContactsMenuController $controller;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $request = $this->createMock(IRequest::class);
+        $this->userSession = $this->createMock(IUserSession::class);
+        $this->contactsManager = $this->createMock(Manager::class);
+
+        $this->controller = new ContactsMenuController($request, $this->userSession, $this->contactsManager);
+    }
+
+    public function testIndex(): void {
+        $user = $this->createMock(IUser::class);
+        $entries = [
+            $this->createMock(IEntry::class),
+            $this->createMock(IEntry::class),
+        ];
+        $this->userSession->expects($this->once())
+            ->method('getUser')
+            ->willReturn($user);
+        $this->contactsManager->expects($this->once())
+            ->method('getEntries')
+            ->with($this->equalTo($user), $this->equalTo(null))
+            ->willReturn($entries);
+
+        $response = $this->controller->index();
+
+        $this->assertEquals($entries, $response);
+    }
+
+    public function testFindOne(): void {
+        $user = $this->createMock(IUser::class);
+        $entry = $this->createMock(IEntry::class);
+        $this->userSession->expects($this->once())
+            ->method('getUser')
+            ->willReturn($user);
+        $this->contactsManager->expects($this->once())
+            ->method('findOne')
+            ->with($this->equalTo($user), $this->equalTo(42), $this->equalTo('test-search-phrase'))
+            ->willReturn($entry);
+
+        $response = $this->controller->findOne(42, 'test-search-phrase');
+
+        $this->assertEquals($entry, $response);
+    }
+
+    public function testFindOne404(): void {
+        $user = $this->createMock(IUser::class);
+        $this->userSession->expects($this->once())
+            ->method('getUser')
+            ->willReturn($user);
+        $this->contactsManager->expects($this->once())
+            ->method('findOne')
+            ->with($this->equalTo($user), $this->equalTo(42), $this->equalTo('test-search-phrase'))
+            ->willReturn(null);
+
+        $response = $this->controller->findOne(42, 'test-search-phrase');
+
+        $this->assertEquals([], $response->getData());
+        $this->assertEquals(404, $response->getStatus());
+    }
 }

tests/Core/Command/Maintenance/UpdateTheme.php

Indentation +43 added lines, -43 removed lines

@@ -16,47 +16,47 @@
 use Test\TestCase;
 
 class UpdateThemeTest extends TestCase {
-	/** @var IMimeTypeDetector */
-	protected $detector;
-	/** @var ICacheFactory */
-	protected $cacheFactory;
-
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject */
-	protected $consoleInput;
-	/** @var \PHPUnit\Framework\MockObject\MockObject */
-	protected $consoleOutput;
-
-	/** @var \Symfony\Component\Console\Command\Command */
-	protected $command;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->detector = $this->createMock(Detection::class);
-		$this->cacheFactory = $this->createMock(ICacheFactory::class);
-
-		$this->consoleInput = $this->getMockBuilder(InputInterface::class)->getMock();
-		$this->consoleOutput = $this->getMockBuilder(OutputInterface::class)->getMock();
-
-		$this->command = new UpdateTheme($this->detector, $this->cacheFactory);
-	}
-
-	public function testThemeUpdate(): void {
-		$this->consoleInput->method('getOption')
-			->with('maintenance:theme:update')
-			->willReturn(true);
-		$this->detector->expects($this->once())
-			->method('getAllAliases')
-			->willReturn([]);
-		$cache = $this->createMock(ICache::class);
-		$cache->expects($this->once())
-			->method('clear')
-			->with('');
-		$this->cacheFactory->expects($this->once())
-			->method('createDistributed')
-			->with('imagePath')
-			->willReturn($cache);
-		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
-	}
+    /** @var IMimeTypeDetector */
+    protected $detector;
+    /** @var ICacheFactory */
+    protected $cacheFactory;
+
+
+    /** @var \PHPUnit\Framework\MockObject\MockObject */
+    protected $consoleInput;
+    /** @var \PHPUnit\Framework\MockObject\MockObject */
+    protected $consoleOutput;
+
+    /** @var \Symfony\Component\Console\Command\Command */
+    protected $command;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->detector = $this->createMock(Detection::class);
+        $this->cacheFactory = $this->createMock(ICacheFactory::class);
+
+        $this->consoleInput = $this->getMockBuilder(InputInterface::class)->getMock();
+        $this->consoleOutput = $this->getMockBuilder(OutputInterface::class)->getMock();
+
+        $this->command = new UpdateTheme($this->detector, $this->cacheFactory);
+    }
+
+    public function testThemeUpdate(): void {
+        $this->consoleInput->method('getOption')
+            ->with('maintenance:theme:update')
+            ->willReturn(true);
+        $this->detector->expects($this->once())
+            ->method('getAllAliases')
+            ->willReturn([]);
+        $cache = $this->createMock(ICache::class);
+        $cache->expects($this->once())
+            ->method('clear')
+            ->with('');
+        $this->cacheFactory->expects($this->once())
+            ->method('createDistributed')
+            ->with('imagePath')
+            ->willReturn($cache);
+        self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+    }
 }