nextcloud / server

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]);
+    }
 }

tests/Core/Command/TwoFactorAuth/EnforceTest.php

Indentation +108 added lines, -108 removed lines

@@ -17,112 +17,112 @@
 use Test\TestCase;
 
 class EnforceTest extends TestCase {
-	/** @var MandatoryTwoFactor|MockObject */
-	private $mandatoryTwoFactor;
-
-	/** @var CommandTester */
-	private $command;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->mandatoryTwoFactor = $this->createMock(MandatoryTwoFactor::class);
-		$command = new Enforce($this->mandatoryTwoFactor);
-
-		$this->command = new CommandTester($command);
-	}
-
-	public function testEnforce(): void {
-		$this->mandatoryTwoFactor->expects($this->once())
-			->method('setState')
-			->with($this->equalTo(new EnforcementState(true)));
-		$this->mandatoryTwoFactor->expects($this->once())
-			->method('getState')
-			->willReturn(new EnforcementState(true));
-
-		$rc = $this->command->execute([
-			'--on' => true,
-		]);
-
-		$this->assertEquals(0, $rc);
-		$display = $this->command->getDisplay();
-		$this->assertStringContainsString('Two-factor authentication is enforced for all users', $display);
-	}
-
-	public function testEnforceForOneGroup(): void {
-		$this->mandatoryTwoFactor->expects($this->once())
-			->method('setState')
-			->with($this->equalTo(new EnforcementState(true, ['twofactorers'])));
-		$this->mandatoryTwoFactor->expects($this->once())
-			->method('getState')
-			->willReturn(new EnforcementState(true, ['twofactorers']));
-
-		$rc = $this->command->execute([
-			'--on' => true,
-			'--group' => ['twofactorers'],
-		]);
-
-		$this->assertEquals(0, $rc);
-		$display = $this->command->getDisplay();
-		$this->assertStringContainsString('Two-factor authentication is enforced for members of the group(s) twofactorers', $display);
-	}
-
-	public function testEnforceForAllExceptOneGroup(): void {
-		$this->mandatoryTwoFactor->expects($this->once())
-			->method('setState')
-			->with($this->equalTo(new EnforcementState(true, [], ['yoloers'])));
-		$this->mandatoryTwoFactor->expects($this->once())
-			->method('getState')
-			->willReturn(new EnforcementState(true, [], ['yoloers']));
-
-		$rc = $this->command->execute([
-			'--on' => true,
-			'--exclude' => ['yoloers'],
-		]);
-
-		$this->assertEquals(0, $rc);
-		$display = $this->command->getDisplay();
-		$this->assertStringContainsString('Two-factor authentication is enforced for all users, except members of yoloers', $display);
-	}
-
-	public function testDisableEnforced(): void {
-		$this->mandatoryTwoFactor->expects($this->once())
-			->method('setState')
-			->with(new EnforcementState(false));
-		$this->mandatoryTwoFactor->expects($this->once())
-			->method('getState')
-			->willReturn(new EnforcementState(false));
-
-		$rc = $this->command->execute([
-			'--off' => true,
-		]);
-
-		$this->assertEquals(0, $rc);
-		$display = $this->command->getDisplay();
-		$this->assertStringContainsString('Two-factor authentication is not enforced', $display);
-	}
-
-	public function testCurrentStateEnabled(): void {
-		$this->mandatoryTwoFactor->expects($this->once())
-			->method('getState')
-			->willReturn(new EnforcementState(true));
-
-		$rc = $this->command->execute([]);
-
-		$this->assertEquals(0, $rc);
-		$display = $this->command->getDisplay();
-		$this->assertStringContainsString('Two-factor authentication is enforced for all users', $display);
-	}
-
-	public function testCurrentStateDisabled(): void {
-		$this->mandatoryTwoFactor->expects($this->once())
-			->method('getState')
-			->willReturn(new EnforcementState(false));
-
-		$rc = $this->command->execute([]);
-
-		$this->assertEquals(0, $rc);
-		$display = $this->command->getDisplay();
-		$this->assertStringContainsString('Two-factor authentication is not enforced', $display);
-	}
+    /** @var MandatoryTwoFactor|MockObject */
+    private $mandatoryTwoFactor;
+
+    /** @var CommandTester */
+    private $command;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->mandatoryTwoFactor = $this->createMock(MandatoryTwoFactor::class);
+        $command = new Enforce($this->mandatoryTwoFactor);
+
+        $this->command = new CommandTester($command);
+    }
+
+    public function testEnforce(): void {
+        $this->mandatoryTwoFactor->expects($this->once())
+            ->method('setState')
+            ->with($this->equalTo(new EnforcementState(true)));
+        $this->mandatoryTwoFactor->expects($this->once())
+            ->method('getState')
+            ->willReturn(new EnforcementState(true));
+
+        $rc = $this->command->execute([
+            '--on' => true,
+        ]);
+
+        $this->assertEquals(0, $rc);
+        $display = $this->command->getDisplay();
+        $this->assertStringContainsString('Two-factor authentication is enforced for all users', $display);
+    }
+
+    public function testEnforceForOneGroup(): void {
+        $this->mandatoryTwoFactor->expects($this->once())
+            ->method('setState')
+            ->with($this->equalTo(new EnforcementState(true, ['twofactorers'])));
+        $this->mandatoryTwoFactor->expects($this->once())
+            ->method('getState')
+            ->willReturn(new EnforcementState(true, ['twofactorers']));
+
+        $rc = $this->command->execute([
+            '--on' => true,
+            '--group' => ['twofactorers'],
+        ]);
+
+        $this->assertEquals(0, $rc);
+        $display = $this->command->getDisplay();
+        $this->assertStringContainsString('Two-factor authentication is enforced for members of the group(s) twofactorers', $display);
+    }
+
+    public function testEnforceForAllExceptOneGroup(): void {
+        $this->mandatoryTwoFactor->expects($this->once())
+            ->method('setState')
+            ->with($this->equalTo(new EnforcementState(true, [], ['yoloers'])));
+        $this->mandatoryTwoFactor->expects($this->once())
+            ->method('getState')
+            ->willReturn(new EnforcementState(true, [], ['yoloers']));
+
+        $rc = $this->command->execute([
+            '--on' => true,
+            '--exclude' => ['yoloers'],
+        ]);
+
+        $this->assertEquals(0, $rc);
+        $display = $this->command->getDisplay();
+        $this->assertStringContainsString('Two-factor authentication is enforced for all users, except members of yoloers', $display);
+    }
+
+    public function testDisableEnforced(): void {
+        $this->mandatoryTwoFactor->expects($this->once())
+            ->method('setState')
+            ->with(new EnforcementState(false));
+        $this->mandatoryTwoFactor->expects($this->once())
+            ->method('getState')
+            ->willReturn(new EnforcementState(false));
+
+        $rc = $this->command->execute([
+            '--off' => true,
+        ]);
+
+        $this->assertEquals(0, $rc);
+        $display = $this->command->getDisplay();
+        $this->assertStringContainsString('Two-factor authentication is not enforced', $display);
+    }
+
+    public function testCurrentStateEnabled(): void {
+        $this->mandatoryTwoFactor->expects($this->once())
+            ->method('getState')
+            ->willReturn(new EnforcementState(true));
+
+        $rc = $this->command->execute([]);
+
+        $this->assertEquals(0, $rc);
+        $display = $this->command->getDisplay();
+        $this->assertStringContainsString('Two-factor authentication is enforced for all users', $display);
+    }
+
+    public function testCurrentStateDisabled(): void {
+        $this->mandatoryTwoFactor->expects($this->once())
+            ->method('getState')
+            ->willReturn(new EnforcementState(false));
+
+        $rc = $this->command->execute([]);
+
+        $this->assertEquals(0, $rc);
+        $display = $this->command->getDisplay();
+        $this->assertStringContainsString('Two-factor authentication is not enforced', $display);
+    }
 }

tests/Core/Command/TwoFactorAuth/StateTest.php

Indentation +73 added lines, -73 removed lines

@@ -18,77 +18,77 @@
 use Test\TestCase;
 
 class StateTest extends TestCase {
-	/** @var IRegistry|MockObject */
-	private $registry;
-
-	/** @var IUserManager|MockObject */
-	private $userManager;
-
-	/** @var CommandTester|MockObject */
-	private $cmd;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->registry = $this->createMock(IRegistry::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-
-		$cmd = new State($this->registry, $this->userManager);
-		$this->cmd = new CommandTester($cmd);
-	}
-
-	public function testWrongUID(): void {
-		$this->cmd->execute([
-			'uid' => 'nope',
-		]);
-
-		$output = $this->cmd->getDisplay();
-		$this->assertStringContainsString('Invalid UID', $output);
-	}
-
-	public function testStateNoProvidersActive(): void {
-		$user = $this->createMock(IUser::class);
-		$this->userManager->expects($this->once())
-			->method('get')
-			->with('eldora')
-			->willReturn($user);
-		$states = [
-			'u2f' => false,
-			'totp' => false,
-		];
-		$this->registry->expects($this->once())
-			->method('getProviderStates')
-			->with($user)
-			->willReturn($states);
-
-		$this->cmd->execute([
-			'uid' => 'eldora',
-		]);
-
-		$output = $this->cmd->getDisplay();
-		$this->assertStringContainsString('Two-factor authentication is not enabled for user eldora', $output);
-	}
-
-	public function testStateOneProviderActive(): void {
-		$user = $this->createMock(IUser::class);
-		$this->userManager->expects($this->once())
-			->method('get')
-			->with('mohamed')
-			->willReturn($user);
-		$states = [
-			'u2f' => true,
-			'totp' => false,
-		];
-		$this->registry->expects($this->once())
-			->method('getProviderStates')
-			->with($user)
-			->willReturn($states);
-
-		$this->cmd->execute([
-			'uid' => 'mohamed',
-		]);
-
-		$output = $this->cmd->getDisplay();
-		$this->assertStringContainsString('Two-factor authentication is enabled for user mohamed', $output);
-	}
+    /** @var IRegistry|MockObject */
+    private $registry;
+
+    /** @var IUserManager|MockObject */
+    private $userManager;
+
+    /** @var CommandTester|MockObject */
+    private $cmd;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->registry = $this->createMock(IRegistry::class);
+        $this->userManager = $this->createMock(IUserManager::class);
+
+        $cmd = new State($this->registry, $this->userManager);
+        $this->cmd = new CommandTester($cmd);
+    }
+
+    public function testWrongUID(): void {
+        $this->cmd->execute([
+            'uid' => 'nope',
+        ]);
+
+        $output = $this->cmd->getDisplay();
+        $this->assertStringContainsString('Invalid UID', $output);
+    }
+
+    public function testStateNoProvidersActive(): void {
+        $user = $this->createMock(IUser::class);
+        $this->userManager->expects($this->once())
+            ->method('get')
+            ->with('eldora')
+            ->willReturn($user);
+        $states = [
+            'u2f' => false,
+            'totp' => false,
+        ];
+        $this->registry->expects($this->once())
+            ->method('getProviderStates')
+            ->with($user)
+            ->willReturn($states);
+
+        $this->cmd->execute([
+            'uid' => 'eldora',
+        ]);
+
+        $output = $this->cmd->getDisplay();
+        $this->assertStringContainsString('Two-factor authentication is not enabled for user eldora', $output);
+    }
+
+    public function testStateOneProviderActive(): void {
+        $user = $this->createMock(IUser::class);
+        $this->userManager->expects($this->once())
+            ->method('get')
+            ->with('mohamed')
+            ->willReturn($user);
+        $states = [
+            'u2f' => true,
+            'totp' => false,
+        ];
+        $this->registry->expects($this->once())
+            ->method('getProviderStates')
+            ->with($user)
+            ->willReturn($states);
+
+        $this->cmd->execute([
+            'uid' => 'mohamed',
+        ]);
+
+        $output = $this->cmd->getDisplay();
+        $this->assertStringContainsString('Two-factor authentication is enabled for user mohamed', $output);
+    }
 }

tests/Core/Command/TwoFactorAuth/CleanupTest.php

Indentation +24 added lines, -24 removed lines

@@ -17,36 +17,36 @@
 use Test\TestCase;
 
 class CleanupTest extends TestCase {
-	/** @var IRegistry|MockObject */
-	private $registry;
+    /** @var IRegistry|MockObject */
+    private $registry;
 
-	/** @var IUserManager|MockObject */
-	private $userManager;
+    /** @var IUserManager|MockObject */
+    private $userManager;
 
-	/** @var CommandTester */
-	private $cmd;
+    /** @var CommandTester */
+    private $cmd;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->registry = $this->createMock(IRegistry::class);
-		$this->userManager = $this->createMock(IUserManager::class);
+        $this->registry = $this->createMock(IRegistry::class);
+        $this->userManager = $this->createMock(IUserManager::class);
 
-		$cmd = new Cleanup($this->registry, $this->userManager);
-		$this->cmd = new CommandTester($cmd);
-	}
+        $cmd = new Cleanup($this->registry, $this->userManager);
+        $this->cmd = new CommandTester($cmd);
+    }
 
-	public function testCleanup(): void {
-		$this->registry->expects($this->once())
-			->method('cleanUp')
-			->with('u2f');
+    public function testCleanup(): void {
+        $this->registry->expects($this->once())
+            ->method('cleanUp')
+            ->with('u2f');
 
-		$rc = $this->cmd->execute([
-			'provider-id' => 'u2f',
-		]);
+        $rc = $this->cmd->execute([
+            'provider-id' => 'u2f',
+        ]);
 
-		$this->assertEquals(0, $rc);
-		$output = $this->cmd->getDisplay();
-		$this->assertStringContainsString('All user-provider associations for provider u2f have been removed', $output);
-	}
+        $this->assertEquals(0, $rc);
+        $output = $this->cmd->getDisplay();
+        $this->assertStringContainsString('All user-provider associations for provider u2f have been removed', $output);
+    }
 }

tests/Core/Command/TwoFactorAuth/EnableTest.php

Indentation +73 added lines, -73 removed lines

@@ -18,77 +18,77 @@
 use Test\TestCase;
 
 class EnableTest extends TestCase {
-	/** @var ProviderManager|MockObject */
-	private $providerManager;
-
-	/** @var IUserManager|MockObject */
-	private $userManager;
-
-	/** @var CommandTester */
-	private $command;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->providerManager = $this->createMock(ProviderManager::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-
-		$cmd = new Enable($this->providerManager, $this->userManager);
-		$this->command = new CommandTester($cmd);
-	}
-
-	public function testInvalidUID(): void {
-		$this->userManager->expects($this->once())
-			->method('get')
-			->with('nope')
-			->willReturn(null);
-
-		$rc = $this->command->execute([
-			'uid' => 'nope',
-			'provider_id' => 'nope',
-		]);
-
-		$this->assertEquals(1, $rc);
-		$this->assertStringContainsString('Invalid UID', $this->command->getDisplay());
-	}
-
-	public function testEnableNotSupported(): void {
-		$user = $this->createMock(IUser::class);
-		$this->userManager->expects($this->once())
-			->method('get')
-			->with('belle')
-			->willReturn($user);
-		$this->providerManager->expects($this->once())
-			->method('tryEnableProviderFor')
-			->with('totp', $user)
-			->willReturn(false);
-
-		$rc = $this->command->execute([
-			'uid' => 'belle',
-			'provider_id' => 'totp',
-		]);
-
-		$this->assertEquals(2, $rc);
-		$this->assertStringContainsString('The provider does not support this operation', $this->command->getDisplay());
-	}
-
-	public function testEnabled(): void {
-		$user = $this->createMock(IUser::class);
-		$this->userManager->expects($this->once())
-			->method('get')
-			->with('belle')
-			->willReturn($user);
-		$this->providerManager->expects($this->once())
-			->method('tryEnableProviderFor')
-			->with('totp', $user)
-			->willReturn(true);
-
-		$rc = $this->command->execute([
-			'uid' => 'belle',
-			'provider_id' => 'totp',
-		]);
-
-		$this->assertEquals(0, $rc);
-		$this->assertStringContainsString('Two-factor provider totp enabled for user belle', $this->command->getDisplay());
-	}
+    /** @var ProviderManager|MockObject */
+    private $providerManager;
+
+    /** @var IUserManager|MockObject */
+    private $userManager;
+
+    /** @var CommandTester */
+    private $command;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->providerManager = $this->createMock(ProviderManager::class);
+        $this->userManager = $this->createMock(IUserManager::class);
+
+        $cmd = new Enable($this->providerManager, $this->userManager);
+        $this->command = new CommandTester($cmd);
+    }
+
+    public function testInvalidUID(): void {
+        $this->userManager->expects($this->once())
+            ->method('get')
+            ->with('nope')
+            ->willReturn(null);
+
+        $rc = $this->command->execute([
+            'uid' => 'nope',
+            'provider_id' => 'nope',
+        ]);
+
+        $this->assertEquals(1, $rc);
+        $this->assertStringContainsString('Invalid UID', $this->command->getDisplay());
+    }
+
+    public function testEnableNotSupported(): void {
+        $user = $this->createMock(IUser::class);
+        $this->userManager->expects($this->once())
+            ->method('get')
+            ->with('belle')
+            ->willReturn($user);
+        $this->providerManager->expects($this->once())
+            ->method('tryEnableProviderFor')
+            ->with('totp', $user)
+            ->willReturn(false);
+
+        $rc = $this->command->execute([
+            'uid' => 'belle',
+            'provider_id' => 'totp',
+        ]);
+
+        $this->assertEquals(2, $rc);
+        $this->assertStringContainsString('The provider does not support this operation', $this->command->getDisplay());
+    }
+
+    public function testEnabled(): void {
+        $user = $this->createMock(IUser::class);
+        $this->userManager->expects($this->once())
+            ->method('get')
+            ->with('belle')
+            ->willReturn($user);
+        $this->providerManager->expects($this->once())
+            ->method('tryEnableProviderFor')
+            ->with('totp', $user)
+            ->willReturn(true);
+
+        $rc = $this->command->execute([
+            'uid' => 'belle',
+            'provider_id' => 'totp',
+        ]);
+
+        $this->assertEquals(0, $rc);
+        $this->assertStringContainsString('Two-factor provider totp enabled for user belle', $this->command->getDisplay());
+    }
 }

tests/Core/Command/TwoFactorAuth/DisableTest.php

Indentation +73 added lines, -73 removed lines

@@ -18,77 +18,77 @@
 use Test\TestCase;
 
 class DisableTest extends TestCase {
-	/** @var ProviderManager|MockObject */
-	private $providerManager;
-
-	/** @var IUserManager|MockObject */
-	private $userManager;
-
-	/** @var CommandTester */
-	private $command;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->providerManager = $this->createMock(ProviderManager::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-
-		$cmd = new Disable($this->providerManager, $this->userManager);
-		$this->command = new CommandTester($cmd);
-	}
-
-	public function testInvalidUID(): void {
-		$this->userManager->expects($this->once())
-			->method('get')
-			->with('nope')
-			->willReturn(null);
-
-		$rc = $this->command->execute([
-			'uid' => 'nope',
-			'provider_id' => 'nope',
-		]);
-
-		$this->assertEquals(1, $rc);
-		$this->assertStringContainsString('Invalid UID', $this->command->getDisplay());
-	}
-
-	public function testEnableNotSupported(): void {
-		$user = $this->createMock(IUser::class);
-		$this->userManager->expects($this->once())
-			->method('get')
-			->with('ricky')
-			->willReturn($user);
-		$this->providerManager->expects($this->once())
-			->method('tryDisableProviderFor')
-			->with('totp', $user)
-			->willReturn(false);
-
-		$rc = $this->command->execute([
-			'uid' => 'ricky',
-			'provider_id' => 'totp',
-		]);
-
-		$this->assertEquals(2, $rc);
-		$this->assertStringContainsString('The provider does not support this operation', $this->command->getDisplay());
-	}
-
-	public function testEnabled(): void {
-		$user = $this->createMock(IUser::class);
-		$this->userManager->expects($this->once())
-			->method('get')
-			->with('ricky')
-			->willReturn($user);
-		$this->providerManager->expects($this->once())
-			->method('tryDisableProviderFor')
-			->with('totp', $user)
-			->willReturn(true);
-
-		$rc = $this->command->execute([
-			'uid' => 'ricky',
-			'provider_id' => 'totp',
-		]);
-
-		$this->assertEquals(0, $rc);
-		$this->assertStringContainsString('Two-factor provider totp disabled for user ricky', $this->command->getDisplay());
-	}
+    /** @var ProviderManager|MockObject */
+    private $providerManager;
+
+    /** @var IUserManager|MockObject */
+    private $userManager;
+
+    /** @var CommandTester */
+    private $command;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->providerManager = $this->createMock(ProviderManager::class);
+        $this->userManager = $this->createMock(IUserManager::class);
+
+        $cmd = new Disable($this->providerManager, $this->userManager);
+        $this->command = new CommandTester($cmd);
+    }
+
+    public function testInvalidUID(): void {
+        $this->userManager->expects($this->once())
+            ->method('get')
+            ->with('nope')
+            ->willReturn(null);
+
+        $rc = $this->command->execute([
+            'uid' => 'nope',
+            'provider_id' => 'nope',
+        ]);
+
+        $this->assertEquals(1, $rc);
+        $this->assertStringContainsString('Invalid UID', $this->command->getDisplay());
+    }
+
+    public function testEnableNotSupported(): void {
+        $user = $this->createMock(IUser::class);
+        $this->userManager->expects($this->once())
+            ->method('get')
+            ->with('ricky')
+            ->willReturn($user);
+        $this->providerManager->expects($this->once())
+            ->method('tryDisableProviderFor')
+            ->with('totp', $user)
+            ->willReturn(false);
+
+        $rc = $this->command->execute([
+            'uid' => 'ricky',
+            'provider_id' => 'totp',
+        ]);
+
+        $this->assertEquals(2, $rc);
+        $this->assertStringContainsString('The provider does not support this operation', $this->command->getDisplay());
+    }
+
+    public function testEnabled(): void {
+        $user = $this->createMock(IUser::class);
+        $this->userManager->expects($this->once())
+            ->method('get')
+            ->with('ricky')
+            ->willReturn($user);
+        $this->providerManager->expects($this->once())
+            ->method('tryDisableProviderFor')
+            ->with('totp', $user)
+            ->willReturn(true);
+
+        $rc = $this->command->execute([
+            'uid' => 'ricky',
+            'provider_id' => 'totp',
+        ]);
+
+        $this->assertEquals(0, $rc);
+        $this->assertStringContainsString('Two-factor provider totp disabled for user ricky', $this->command->getDisplay());
+    }
 }