php codesniffer fixes

fisharebest · Nov 1, 2024 · 55fb9e2 · 55fb9e2
1 parent ecbcf29
commit 55fb9e2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/app/Http/RequestHandlers/AccountUpdate.php b/app/Http/RequestHandlers/AccountUpdate.php
@@ -83,7 +83,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         if ($secret !== '' || $status_mfa === false) {
             $user->setSecret($secret);
         }
-
         // Change the username
         if ($user_name !== $user->userName()) {
             if ($this->user_service->findByUserName($user_name) === null) {

diff --git a/app/Http/RequestHandlers/LoginAction.php b/app/Http/RequestHandlers/LoginAction.php
@@ -133,15 +133,14 @@ private function doLogin(string $username, #[\SensitiveParameter] string $passwo
         }
         if ($user->getPreference(UserInterface::PREF_IS_STATUS_MFA) !== '') {
             # covers scenario where 2fa not enabled by user
-            if($code2fa != '') {
+            if ($code2fa != '') {
                 if (!$user->check2FAcode($code2fa)) {
                     throw new Exception(I18N::translate('2FA code does not match. Please try again.'));
                 }
-            }
-            else {
+            } else {
                     throw new Exception(I18N::translate('2FA code must be entered as you have 2FA authentication enabled. Please try again.'));
             }
-        }  
+        }
         Auth::login($user);
         Log::addAuthenticationLog('Login: ' . Auth::user()->userName() . '/' . Auth::user()->realName());
         Auth::user()->setPreference(UserInterface::PREF_TIMESTAMP_ACTIVE, (string) time());

diff --git a/app/Http/RequestHandlers/RegisterAction.php b/app/Http/RequestHandlers/RegisterAction.php
@@ -247,10 +247,10 @@ private function doValidateRegistration(
         ServerRequestInterface $request,
         string $username,
         string $email,
-        string $realname,        
+        string $realname,
         string $comments,
-	#[\SensitiveParameter] string $password,
-	string $secret
+        #[\SensitiveParameter] string $password,
+        string $secret
     ): void {
         // All fields are required
         if ($username === '' || $email === '' || $realname === '' || $comments === '' || $password === '') {

diff --git a/app/User.php b/app/User.php
@@ -124,10 +124,11 @@ public function genQRcode(): array
         $google2fa = new Google2FA();
         $qrinfo['secret'] = $google2fa->generateSecretKey();
         $data = 'otpauth://totp/' . $this->user_id . '?secret=' . $qrinfo['secret'] . '&issuer=' . $_SERVER['SERVER_NAME'];
-        $qrinfo['qrcode'] = (new QRCode)->render($data);
+        $qrinfo['qrcode'] = new QRCode();
+        $qrinfo['qrcode'] = QRCode->render($data);
         return $qrinfo;
     }
- 
+
     /**
      * Set the real name of this user.
      *
@@ -290,8 +291,8 @@ public function check2facode(string $code2fa): bool
         $secret = DB::table('user')
              ->where('user_id', '=', $this->id())
              ->value('secret');
-        $google2fa = new Google2FA;
-        if($google2fa->verifyKey($secret, $code2fa)) {
+        $google2fa = new Google2FA();
+        if ($google2fa->verifyKey($secret, $code2fa)) {
                   return true;
         }
         return false;

diff --git a/tests/app/Http/RequestHandlers/AccountUpdateTest.php b/tests/app/Http/RequestHandlers/AccountUpdateTest.php
@@ -64,8 +64,8 @@ public function testHandler(): void
                 'timezone'       => 'g',
                 'user_name'      => 'h',
                 'visible-online' => 'i',
-		'secret'         => 'j',
-		'status-mfa'     => 'k',
+                'secret'         => 'j',
+                'status-mfa'     => 'k',
             ]);
         $response = $handler->handle($request);