Cleaned up code - some files refactored

Author: DanProgs

install/installUtils.php

@@ -485,7 +485,7 @@ function _mysql_make_user($dbhandler, $db_host, $db_name, $login, $passwd)
 
     $isMariaDB = false;
     $isMySQL = false;
-    foreach ($vg as $vn => $vv) {
+    foreach ($vg as $vv) {
         if (strripos($vv, 'MariaDB') !== false) {
             $isMariaDB = true;
             break;

install/sqlParser.class.php

@@ -99,7 +99,7 @@ public function process($filename)
             $sql_dodo = trim(trim($sql_do, "\r\n "));
 
             if (strlen($sql_dodo) > 0) {
-                $num = $num + 1;
+                $num += 1;
                 $status_ok = $this->db_conn->exec_query($sql_dodo);
                 if (! $status_ok) {
                     $this->sql_errors[] = array(

lib/ajax/getreqcoveragenodes.php

@@ -106,7 +106,7 @@ function display_children($dbHandler, $root_node, $parent, $filter_node,
             'target' => $ntypes['requirement'],
             'container' => $ntypes['requirement_spec']
         );
-        foreach ($nodeSet as $key => $row) {
+        foreach ($nodeSet as $row) {
             $path['text'] = htmlspecialchars($row['name']);
             $path['id'] = $row['id'];
 

lib/ajax/getrequirementnodes.php

@@ -106,7 +106,7 @@ function display_children($dbHandler,$root_node,$parent,$filter_node,
     $treeMgr = new tree($dbHandler);
     $ntypes = $treeMgr->get_available_node_types();
     $peerTypes = array('target' => $ntypes['requirement'], 'container' => $ntypes['requirement_spec']);
-    foreach($nodeSet as $key => $row)
+    foreach($nodeSet as $row)
     {
       $path['text'] = htmlspecialchars($row['name']);
       $path['id'] = $row['id'];

lib/ajax/gettprojectnodes.php

@@ -125,7 +125,7 @@ function display_children($dbHandler, $root_node, $parent, $filter_node,
     }
 
     if (! is_null($nodeSet)) {
-        foreach ($nodeSet as $key => $row) {
+        foreach ($nodeSet as $row) {
             $path['text'] = htmlspecialchars($row['name']);
             $path['id'] = $row['id'];
 
@@ -150,7 +150,7 @@ function display_children($dbHandler, $root_node, $parent, $filter_node,
                 case 'testsuite':
                     $items = array();
                     getAllTCasesID($row['id'], $items);
-                    $tcase_qty = sizeof($items);
+                    $tcase_qty = count($items);
 
                     $path['href'] = "javascript:" .
                         $js_function[$row['node_type']] . "({$path['id']})";
@@ -220,7 +220,7 @@ function getAllTCasesID($idList, &$tcIDs)
                 $suiteIDs[] = $row['id'];
             }
         }
-        if (sizeof($suiteIDs)) {
+        if (count($suiteIDs)) {
             $suiteIDs = implode(",", $suiteIDs);
             getAllTCasesID($suiteIDs, $tcIDs);
         }

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

@@ -125,7 +125,7 @@ public function __construct()
 
         // test route with anonymous function
         $this->app->get('/who',
-            function () {
+            function (): void {
                 echo __CLASS__ . ' : Get Route /who';
             });
 
@@ -317,7 +317,7 @@ public function getProjects($idCard = null, $opt = null)
                 }
             } else {
                 // Will consider id = name
-                foreach ($zx as $key => $value) {
+                foreach ($zx as $value) {
                     if (strcmp($value['name'], $idCard) == 0) {
                         $safeString = $this->db->prepare_string($idCard);
                         $op['item'] = $this->tprojectMgr->get_by_name(
@@ -397,7 +397,7 @@ public function getProjectTestCases($idCard)
                 $tcaseIDSet);
             if (! empty($tcaseIDSet)) {
                 $op['items'] = array();
-                foreach ($tcaseIDSet as $key => $tcaseID) {
+                foreach ($tcaseIDSet as $tcaseID) {
                     $item = $this->tcaseMgr->getLastVersionInfo($tcaseID);
                     $item['keywords'] = $this->tcaseMgr->get_keywords_map(
                         $tcaseID);

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

@@ -141,7 +141,7 @@ public function __construct()
         // GET Routes
         // test route with anonymous function
         $this->app->get('/who',
-            function () {
+            function (): void {
                 echo __CLASS__ . ' : You have called the Get Route /who';
             });
 
@@ -516,7 +516,7 @@ public function getProjectTestCases($idCard)
 
             if (! empty($tcaseIDSet)) {
                 $op['items'] = array();
-                foreach ($tcaseIDSet as $key => $tcaseID) {
+                foreach ($tcaseIDSet as $tcaseID) {
                     $item = $this->tcaseMgr->getLastVersionInfo($tcaseID);
                     $item['keywords'] = $this->tcaseMgr->get_keywords_map(
                         $tcaseID, $item['tcversion_id']);

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

@@ -349,7 +349,7 @@ public function getProjectTestCases(Response $response, $idCard)
 
             if (! empty($tcaseIDSet)) {
                 $op['items'] = array();
-                foreach ($tcaseIDSet as $key => $tcaseID) {
+                foreach ($tcaseIDSet as $tcaseID) {
                     $item = $this->tcaseMgr->getLastVersionInfo($tcaseID);
                     $item['keywords'] = $this->tcaseMgr->get_keywords_map(
                         $tcaseID, $item['tcversion_id']);

lib/api/rest/v3/core/routes.php

@@ -3,7 +3,7 @@
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Slim\App;
 
-return function (App $app) {
+return function (App $app): void {
 
     // @20201124 - I do not understand this
     // $app->get('/',World::class . ':hello');

lib/api/rest/v3/custom/routes/routesCustomExample.php

@@ -9,7 +9,7 @@
 use Slim\App;
 
 
-return function (App $app) {
+return function (App $app): void {
   $app->get('/CustomExample/whoAmI',
             array($app->restApiCustomExample,'whoAmI'));