Cleaned up code - some files were refactored with refactor

The following adjustments were made:
- Simplify regex pattern to known ranges (SimplifyRegexPatternRector)
- Return early prepared value in ifs (PreparedValueToEarlyReturnRector)
- Change ternary of bool : false to && bool
(TernaryToBooleanOrFalseToBooleanAndRector)
- Replace if conditioned variable override with direct return
(ReturnEarlyIfVariableRector)
- Remove recasting of the same type (RecastingRemovalRector)

Author: DanProgs

gui/.gitignore

@@ -0,0 +1 @@
+/templates_c/

gui/templates_c/.gitignore

@@ -137,7 +137,7 @@ protected function only_good_sql($v, $comment_char = '-')
 
         // Empty line must not be used
         if ($use_v && strlen($v_c) == 0) {
-            $use_v = false;
+            return false;
         }
 
         return $use_v;

install/sqlParser.class.php

@@ -1443,7 +1443,7 @@ protected function userHasRight($rightToCheck,
 
         if (! $this->user->hasRight($this->db, $rightToCheck, $tproject_id,
             $tplan_id, $checkPublicPrivateAttr)) {
-            $status_ok = false;
+            return false;
         }
         return $status_ok;
     }

lib/api/rest/v2/tlRestApi.class.php

@@ -1709,7 +1709,7 @@ protected function userHasRight($rightToCheck,
 
         if (! $this->user->hasRight($this->db, $rightToCheck, $tproject_id,
             $tplan_id, $checkPublicPrivateAttr)) {
-            $status_ok = false;
+            return false;
         }
         return $status_ok;
     }

lib/api/rest/v3/RestApi.class.php

@@ -81,7 +81,7 @@
 }
 
 // Now reinsert original content if any
-$steps2insert = ! is_null($originalSteps) && count((array) $originalSteps > 0) ? $originalSteps : $fakeSteps;
+$steps2insert = ! is_null($originalSteps) && count($originalSteps > 0) ? $originalSteps : $fakeSteps;
 $args = $commonArgs;
 $args["version"] = $cfg->tcaseVersionNumber;
 $args["action"] = 'create';

lib/api/xmlrpc/v1/sample_clients/php/clientTestSuiteTestCaseStepsManagement.php

@@ -1632,7 +1632,7 @@ protected function _checkCreateBuildRequest($messagePrefix = '')
         ];
         $status_ok = $this->_runChecks($checkFunctions, $messagePrefix);
         if ($status_ok) {
-            $status_ok = $this->_isParamPresent(self::$buildNameParamName,
+            return $this->_isParamPresent(self::$buildNameParamName,
                 $messagePrefix, self::SET_ERROR);
         }
 
@@ -2317,7 +2317,7 @@ public function getProjectTestPlans($args)
             $testProjectID = $this->args[self::$testProjectIDParamName];
             $info = $this->tprojectMgr->get_all_testplans($testProjectID);
             if (! empty($info)) {
-                $info = array_values($info);
+                return array_values($info);
             }
             return $info;
         } else {
@@ -3680,7 +3680,7 @@ protected function getKeywordSet($tproject_id)
         }
 
         if (! is_null($kMethod)) {
-            $keywordSet = $this->$kMethod($tproject_id, $this->args[$accessKey]);
+            return $this->$kMethod($tproject_id, $this->args[$accessKey]);
         }
 
         return $keywordSet;
@@ -4437,7 +4437,7 @@ protected function checkReqIdentity($messagePrefix = '')
         }
 
         if ($status) {
-            $status = $this->checkReqID($messagePrefix);
+            return $this->checkReqID($messagePrefix);
         }
 
         return $status;
@@ -4528,7 +4528,7 @@ protected function checkReqSpecQuality()
         }
 
         if (! $status_ok) {
-            $ret = [
+            return [
                 'status_ok' => false,
                 'error_msg' => $msg,
                 'error_code' => $error_code
@@ -9259,7 +9259,7 @@ public function getIssueTrackerSystem($args, $call = null)
         }
 
         if ($extCall && ! $status_ok) {
-            $ret = $this->errors;
+            return $this->errors;
         }
         return $ret;
     }

lib/api/xmlrpc/v1/xmlrpc.class.php

@@ -26,9 +26,11 @@
  * @param tlUser $user
  * @return boolean
  */
-function checkRights(&$db, &$user)
-{
-    return $user->hasRight($db, "cfield_management") ||
-        $user->hasRight($db, "cfield_view");
+function checkRights(&$db, &$user)
+{
+    if ($user->hasRight($db, "cfield_management")) {
+        return true;
+    }
+    return (bool) $user->hasRight($db, "cfield_view");
 }
 

lib/cfields/cfieldsView.php

@@ -94,9 +94,9 @@ public function connect()
             // $this->cfg is a simpleXML Object, then seems very conservative and safe
             // to cast properties BEFORE using it.
             $this->stashCfg = [
-                'username' => (string) trim($this->cfg->username),
-                'password' => (string) trim($this->cfg->password),
-                'host' => (string) trim($this->cfg->uriapi)
+                'username' => trim($this->cfg->username),
+                'password' => trim($this->cfg->password),
+                'host' => trim($this->cfg->uriapi)
             ];
 
             $this->stashCfg['proxy'] = config_get('proxy');
@@ -157,7 +157,7 @@ public function getProjectsForHTMLSelect()
         $ret = null;
         $projList = $this->getProjects();
         if (property_exists($projList, 'values')) {
-            $ret = $this->objectAttrToKeyName($projList->values);
+            return $this->objectAttrToKeyName($projList->values);
         }
         return $ret;
     }
@@ -180,7 +180,7 @@ public function getReposForHTMLSelect($projectKey)
         $ret = null;
         $repoList = $this->getRepos($projectKey);
         if (property_exists($repoList, 'values')) {
-            $ret = $this->objectAttrToIDName($repoList->values, 'slug', 'name');
+            return $this->objectAttrToIDName($repoList->values, 'slug', 'name');
         }
         return $ret;
     }
@@ -244,7 +244,7 @@ public function getBranchesForHTMLSelect($projectKey, $repoName)
         $ret = null;
         $branchList = $this->getBranches($projectKey, $repoName);
         if (property_exists($branchList, 'values')) {
-            $ret = $this->objectAttrToIDName($branchList->values, 'displayId',
+            return $this->objectAttrToIDName($branchList->values, 'displayId',
                 'displayId');
         }
         return $ret;

lib/codetrackerintegration/stashrestInterface.class.php

@@ -69,8 +69,10 @@ function initArgs()
     return $args;
 }
 
-function checkRights(&$db, &$user)
-{
-    return $user->hasRight($db, "codetracker_view") ||
-        $user->hasRight($db, "codetracker_management");
+function checkRights(&$db, &$user)
+{
+    if ($user->hasRight($db, "codetracker_view")) {
+        return true;
+    }
+    return (bool) $user->hasRight($db, "codetracker_management");
 }