chore: Fix codestyle and adapt tests to new constructor

Signed-off-by: Côme Chilliet <[email protected]>
nextcloud · Jan 30, 2025 · 88aeedd · 88aeedd
1 parent 7ecf444
commit 88aeedd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 31 deletions.
diff --git a/lib/Controller/ApiController.php b/lib/Controller/ApiController.php
@@ -10,9 +10,9 @@
 namespace OCA\ServerInfo\Controller;
 
 use OCA\ServerInfo\DatabaseStatistics;
+use OCA\ServerInfo\FpmStatistics;
 use OCA\ServerInfo\Os;
 use OCA\ServerInfo\PhpStatistics;
-use OCA\ServerInfo\FpmStatistics;
 use OCA\ServerInfo\SessionStatistics;
 use OCA\ServerInfo\ShareStatistics;
 use OCA\ServerInfo\StorageStatistics;

diff --git a/lib/Settings/AdminSettings.php b/lib/Settings/AdminSettings.php
@@ -11,9 +11,9 @@
 namespace OCA\ServerInfo\Settings;
 
 use OCA\ServerInfo\DatabaseStatistics;
+use OCA\ServerInfo\FpmStatistics;
 use OCA\ServerInfo\Os;
 use OCA\ServerInfo\PhpStatistics;
-use OCA\ServerInfo\FpmStatistics;
 use OCA\ServerInfo\SessionStatistics;
 use OCA\ServerInfo\ShareStatistics;
 use OCA\ServerInfo\StorageStatistics;

diff --git a/tests/lib/ApiControllerTest.php b/tests/lib/ApiControllerTest.php
@@ -11,6 +11,7 @@
 
 use OCA\ServerInfo\Controller\ApiController;
 use OCA\ServerInfo\DatabaseStatistics;
+use OCA\ServerInfo\FpmStatistics;
 use OCA\ServerInfo\Os;
 use OCA\ServerInfo\PhpStatistics;
 use OCA\ServerInfo\SessionStatistics;
@@ -23,37 +24,20 @@
 use OCP\IRequest;
 use OCP\IUser;
 use OCP\IUserSession;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class ApiControllerTest extends \Test\TestCase {
-	/** @var Os|\PHPUnit\Framework\MockObject\MockObject */
-	private $os;
-
-	/** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
-	private $request;
-
-	/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
-	private $config;
-
-	/** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $groupManager;
-
-	/** @var SystemStatistics|\PHPUnit\Framework\MockObject\MockObject */
-	private $systemStatistics;
-
-	/** @var StorageStatistics|\PHPUnit\Framework\MockObject\MockObject */
-	private $storageStatistics;
-
-	/** @var PhpStatistics|\PHPUnit\Framework\MockObject\MockObject */
-	private $phpStatistics;
-
-	/** @var DatabaseStatistics|\PHPUnit\Framework\MockObject\MockObject */
-	private $databaseStatistics;
-
-	/** @var ShareStatistics|\PHPUnit\Framework\MockObject\MockObject */
-	private $shareStatistics;
-
-	/** @var SessionStatistics|\PHPUnit\Framework\MockObject\MockObject */
-	private $sessionStatistics;
+	private Os&MockObject $os;
+	private IRequest&MockObject $request;
+	private IConfig&MockObject $config;
+	private IGroupManager&MockObject $groupManager;
+	private SystemStatistics&MockObject $systemStatistics;
+	private StorageStatistics&MockObject $storageStatistics;
+	private PhpStatistics&MockObject $phpStatistics;
+	private FpmStatistics&MockObject $fpmStatistics;
+	private DatabaseStatistics&MockObject $databaseStatistics;
+	private ShareStatistics&MockObject $shareStatistics;
+	private SessionStatistics&MockObject $sessionStatistics;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -65,6 +49,7 @@ protected function setUp(): void {
 		$this->systemStatistics = $this->createMock(SystemStatistics::class);
 		$this->storageStatistics = $this->createMock(StorageStatistics::class);
 		$this->phpStatistics = $this->createMock(PhpStatistics::class);
+		$this->fpmStatistics = $this->createMock(FpmStatistics::class);
 		$this->databaseStatistics = $this->createMock(DatabaseStatistics::class);
 		$this->shareStatistics = $this->createMock(ShareStatistics::class);
 		$this->sessionStatistics = $this->createMock(SessionStatistics::class);
@@ -81,6 +66,7 @@ private function getController($userSession) {
 			$this->systemStatistics,
 			$this->storageStatistics,
 			$this->phpStatistics,
+			$this->fpmStatistics,
 			$this->databaseStatistics,
 			$this->shareStatistics,
 			$this->sessionStatistics