Linting

Author: tchapi

src/Services/BasicAuth.php

@@ -39,9 +39,9 @@ protected function validateUserPass($username, $password): bool
         if ('$2y$' === substr($user->getPassword(), 0, 4)) {
             // Use password_verify with secure passwords
             return password_verify($password, $user->getPassword());
-        } else {
-            // Use unsecure legacy password hashing (from legacy sabre/dav implementation)
-            return $user->getPassword() === $this->utils->hashPassword($username, $password);
         }
+
+        // Use unsecure legacy password hashing (from legacy sabre/dav implementation)
+        return $user->getPassword() === $this->utils->hashPassword($username, $password);
     }
 }

tests/Functional/Controllers/ApiControllerTest.php

@@ -82,11 +82,10 @@ private function getCalendarId($client, int $userId, bool $default = true): int
             $this->assertMatchesRegularExpression('/^\d+$/', $data['data']['user_calendars'][0]['id']);
 
             return $data['data']['user_calendars'][0]['id'];
-        } else {
-            $this->assertMatchesRegularExpression('/^\d+$/', $data['data']['user_calendars'][1]['id']);
-
-            return $data['data']['user_calendars'][1]['id'];
         }
+        $this->assertMatchesRegularExpression('/^\d+$/', $data['data']['user_calendars'][1]['id']);
+
+        return $data['data']['user_calendars'][1]['id'];
     }
 
     /*