Merge pull request #39234 from shdehnavi/refactor_admin_audit_app

nextcloud · Feb 23, 2024 · 2e7e63d · 2e7e63d
2 parents 54e6ad6 + 6e53cf2
commit 2e7e63d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/apps/admin_audit/lib/Actions/Console.php b/apps/admin_audit/lib/Actions/Console.php
@@ -29,7 +29,7 @@
 
 class Console extends Action {
 	/**
-	 * @param $arguments
+	 * @param array $arguments
 	 */
 	public function runCommand(array $arguments): void {
 		if (!isset($arguments[1]) || $arguments[1] === '_completion') {

diff --git a/apps/admin_audit/lib/AppInfo/Application.php b/apps/admin_audit/lib/AppInfo/Application.php
@@ -70,7 +70,6 @@
 use Psr\Log\LoggerInterface;
 
 class Application extends App implements IBootstrap {
-
 	/** @var LoggerInterface */
 	protected $logger;
 

diff --git a/apps/admin_audit/lib/AuditLogger.php b/apps/admin_audit/lib/AuditLogger.php
@@ -32,8 +32,7 @@
  */
 class AuditLogger implements IAuditLogger {
 
-	/** @var LoggerInterface */
-	private $parentLogger;
+	private LoggerInterface $parentLogger;
 
 	public function __construct(ILogFactory $logFactory, IConfig $config) {
 		$auditType = $config->getSystemValueString('log_type_audit', 'file');
@@ -50,39 +49,39 @@ public function __construct(ILogFactory $logFactory, IConfig $config) {
 		$this->parentLogger = $logFactory->getCustomPsrLogger($logFile, $auditType, $auditTag);
 	}
 
-	public function emergency($message, array $context = array()) {
+	public function emergency($message, array $context = array()): void {
 		$this->parentLogger->emergency($message, $context);
 	}
 
-	public function alert($message, array $context = array()) {
+	public function alert($message, array $context = array()): void {
 		$this->parentLogger->alert($message, $context);
 	}
 
-	public function critical($message, array $context = array()) {
+	public function critical($message, array $context = array()): void {
 		$this->parentLogger->critical($message, $context);
 	}
 
-	public function error($message, array $context = array()) {
+	public function error($message, array $context = array()): void {
 		$this->parentLogger->error($message, $context);
 	}
 
-	public function warning($message, array $context = array()) {
+	public function warning($message, array $context = array()): void {
 		$this->parentLogger->warning($message, $context);
 	}
 
-	public function notice($message, array $context = array()) {
+	public function notice($message, array $context = array()): void {
 		$this->parentLogger->notice($message, $context);
 	}
 
-	public function info($message, array $context = array()) {
+	public function info($message, array $context = array()): void {
 		$this->parentLogger->info($message, $context);
 	}
 
-	public function debug($message, array $context = array()) {
+	public function debug($message, array $context = array()): void {
 		$this->parentLogger->debug($message, $context);
 	}
 
-	public function log($level, $message, array $context = array()) {
+	public function log($level, $message, array $context = array()): void {
 		$this->parentLogger->log($level, $message, $context);
 	}
 }
diff --git a/apps/admin_audit/tests/Actions/SecurityTest.php b/apps/admin_audit/tests/Actions/SecurityTest.php
@@ -30,17 +30,15 @@
 use OCA\AdminAudit\AuditLogger;
 use OCP\Authentication\TwoFactorAuth\IProvider;
 use OCP\IUser;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 class SecurityTest extends TestCase {
-	/** @var AuditLogger|\PHPUnit\Framework\MockObject\MockObject */
-	private $logger;
+	private AuditLogger|MockObject $logger;
 
-	/** @var Security */
-	private $security;
+	private Security $security;
 
-	/** @var IUser|\PHPUnit\Framework\MockObject\MockObject */
-	private $user;
+	private MockObject|IUser $user;
 
 	protected function setUp(): void {
 		parent::setUp();