Refactor admin_audit app

Signed-off-by: Hamid Dehnavi <hamid.dev.pro@gmail.com>

diff --git a/apps/admin_audit/lib/Actions/Console.php b/apps/admin_audit/lib/Actions/Console.php
index a69d1f5ff82f317293a9ff48ce44804a51a4c5ef..4635fbecbf35898bf37aeeda7ad3ad84eb311a11 100644 (file)
--- a/apps/admin_audit/lib/Actions/Console.php
+++ b/apps/admin_audit/lib/Actions/Console.php
@@ -29,7 +29,7 @@ namespace OCA\AdminAudit\Actions;
 
 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
index d034e79e0c2afcc8bd3a4c515018576195dba5e8..568f7d4892ce614ee0ba77dd8ace408416dda722 100644 (file)
--- a/apps/admin_audit/lib/AppInfo/Application.php
+++ b/apps/admin_audit/lib/AppInfo/Application.php
@@ -71,8 +71,7 @@ use Psr\Log\LoggerInterface;
 
 class Application extends App implements IBootstrap {
 
-       /** @var LoggerInterface */
-       protected $logger;
+       protected LoggerInterface $logger;
 
        public function __construct() {
                parent::__construct('admin_audit');

diff --git a/apps/admin_audit/lib/AuditLogger.php b/apps/admin_audit/lib/AuditLogger.php
index 0a7a330a7434e41f3968fb70125865c187153607..c32657374099788cd1bdd688a53c7328975a30b2 100644 (file)
--- a/apps/admin_audit/lib/AuditLogger.php
+++ b/apps/admin_audit/lib/AuditLogger.php
@@ -32,8 +32,7 @@ use Psr\Log\LoggerInterface;
  */
 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 @@ class AuditLogger implements IAuditLogger {
                $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
index bba819ad04d7f08dcf6eeabb91f483f8169676fc..93684b5a875e272335454176039fb217026ddaff 100644 (file)
--- a/apps/admin_audit/tests/Actions/SecurityTest.php
+++ b/apps/admin_audit/tests/Actions/SecurityTest.php
@@ -30,17 +30,15 @@ use OCA\AdminAudit\Actions\Security;
 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();