Dev: Use string type-hint instead of type-cast

LimeSurvey · Mar 29, 2023 · 4450ae8 · 4450ae8
1 parent 0748098
commit 4450ae8
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/application/controllers/admin/UserAction.php b/application/controllers/admin/UserAction.php
@@ -65,7 +65,7 @@ public function personalsettings()
                 $repeatPassword = Yii::app()->request->getPost('repeatpassword');
 
                 if ($newPassword !== '' && $repeatPassword !== '') {
-                    $error = $oUserModel->validateNewPassword($newPassword, $oldPassword, $repeatPassword);
+                    $error = $oUserModel->validateNewPassword($newPassword, $oldPassword ?? '', $repeatPassword);
 
                     if ($error !== '') {
                         Yii::app()->setFlashMessage(gT($error), 'error');

diff --git a/application/models/FailedLoginAttempt.php b/application/models/FailedLoginAttempt.php
@@ -197,7 +197,7 @@ private function isWhitelisted(string $ip, string $attemptType): bool
         }
 
         // Validating
-        $whiteListEntries = preg_split('/\n|,/', (string) $whiteList);
+        $whiteListEntries = preg_split('/\n|,/', $whiteList);
         foreach ($whiteListEntries as $whiteListEntry) {
             if (empty($whiteListEntry)) {
                 continue;

diff --git a/application/models/InstallerConfigForm.php b/application/models/InstallerConfigForm.php
@@ -686,7 +686,7 @@ public function setupTables()
         } catch (Exception $e) {
             return array($e->getMessage());
         }
-        $fileName = dirname((string) APPPATH) . '/installer/create-database.php';
+        $fileName = dirname(APPPATH) . '/installer/create-database.php';
         require_once($fileName);
         try {
             populateDatabase($this->db);

diff --git a/application/models/SettingGlobal.php b/application/models/SettingGlobal.php
@@ -134,10 +134,10 @@ public static function increaseAssetsversionnumber()
         $iAssetNumber = self::generateAssetVersionNumber(Yii::app()->getConfig("assetsversionnumber"));
 
         foreach ($versionlines as $line) {
-            if (strpos((string) $line, 'assetsversionnumber') !== false) {
+            if (strpos($line, 'assetsversionnumber') !== false) {
                 $line = '$config[\'assetsversionnumber\'] = \'' . $iAssetNumber . '\';' . "\r\n";
             }
-            fwrite($handle, (string) $line);
+            fwrite($handle, $line);
         }
         fclose($handle);
         Yii::app()->setConfig("assetsversionnumber", $iAssetNumber);

diff --git a/application/models/User.php b/application/models/User.php
@@ -273,14 +273,14 @@ public function checkPassword($sPassword)
     /**
      * @todo document me
      */
-    public function checkPasswordStrength($password)
+    public function checkPasswordStrength(string $password)
     {
         $settings = Yii::app()->getConfig("passwordValidationRules");
-        $length = strlen((string) $password);
-        $lowercase = preg_match_all('@[a-z]@', (string) $password);
-        $uppercase = preg_match_all('@[A-Z]@', (string) $password);
-        $number    = preg_match_all('@[0-9]@', (string) $password);
-        $specialChars = preg_match_all('@[^\w]@', (string) $password);
+        $length = strlen($password);
+        $lowercase = preg_match_all('@[a-z]@', $password);
+        $uppercase = preg_match_all('@[A-Z]@', $password);
+        $number    = preg_match_all('@[0-9]@', $password);
+        $specialChars = preg_match_all('@[^\w]@', $password);
 
         $error = "";
         if ((int) $settings['min'] > 0) {
@@ -325,12 +325,12 @@ public function checkPasswordStrength($password)
      *  -- newpassword and repeatpassword are identical
      *  -- newpassword is not empty
      *
-     * @param $newPassword
-     * @param $oldPassword
-     * @param $repeatPassword
+     * @param string $newPassword
+     * @param string $oldPassword
+     * @param string $repeatPassword
      * @return string empty string means everything is ok, otherwise error message is returned
      */
-    public function validateNewPassword($newPassword, $oldPassword, $repeatPassword)
+    public function validateNewPassword(string $newPassword, string $oldPassword, string $repeatPassword)
     {
         $errorMsg = '';
 
@@ -342,14 +342,14 @@ public function validateNewPassword($newPassword, $oldPassword, $repeatPassword)
             if (!$this->checkPassword($oldPassword)) {
                 // Always check password
                 $errorMsg = gT("Your new password was not saved because the old password was wrong.");
-            } elseif (trim((string) $oldPassword) === trim((string) $newPassword)) {
+            } elseif (trim($oldPassword) === trim($newPassword)) {
                 //First test if old and new password are identical => no need to save it (or ?)
                 $errorMsg = gT("Your new password was not saved because it matches the old password.");
-            } elseif (trim((string) $newPassword) !== trim((string) $repeatPassword)) {
+            } elseif (trim($newPassword) !== trim($repeatPassword)) {
                 //Then test the new password and the repeat password for identity
                 $errorMsg = gT("Your new password was not saved because the passwords did not match.");
                 //Now check if the old password matches the old password saved
-            } elseif (empty(trim((string) $newPassword))) {
+            } elseif (empty(trim($newPassword))) {
                 $errorMsg = gT("The new password can not be empty.");
             }
         }