Cleaned up code - some files refactored

Author: DanProgs

lib/codetrackerintegration/codeTrackerInterface.class.php

@@ -33,10 +33,10 @@ abstract class codeTrackerInterface
 
     // members to store the codetracking information.
     // Values are set in the actual subclasses
-    private $cfg = null;
+    public $cfg = null;
 
     // simpleXML object
-    private $name = null;
+    public $name = null;
 
     private $tlCharSet = null;
 
@@ -46,12 +46,12 @@ abstract class codeTrackerInterface
     // usable only if interface is done via direct DB access.
     private $dbMsg = '';
 
-    private $connected = false;
+    public $connected = false;
 
-    private $interfaceViaDB = false;
+    public $interfaceViaDB = false;
 
     // useful for connect/disconnect methods
-    private $guiCfg = array();
+    public $guiCfg = array();
 
     /**
      * Construct and connect to CTS.

lib/codetrackers/codeTrackerEdit.php

@@ -196,10 +196,10 @@ function initializeGui(&$dbHandler, &$argsObj, &$commandMgr)
 
 /**
  *
- * @param $db resource
+ * @param database $db
  *            the database connection handle
- * @param $user the
- *            current active user
+ * @param tlUser $user
+ *            the current active user
  *
  * @return boolean returns true if the page can be accessed
  */

lib/execute/execSetResults.php

@@ -1664,7 +1664,7 @@ function initializeGui(&$dbHandler, &$argsObj, &$cfgObj, &$tplanMgr, &$tcaseMgr,
             $gui->issueTrackerCfg->editIssueAttr = (intval(
                 $itsCfg->userinteraction) > 0);
             $gui->issueTrackerCfg->crudIssueViaAPI = (intval(
-                $itsCfg->createissueviaapi) > 0);
+                $itsCfg->createissueviaapi) > 0) ?? false;
 
             $gui->issueTrackerIntegrationOn = true;
             $gui->accessToIssueTracker = lang_get('link_bts_create_bug') .

lib/functions/logger.class.php

@@ -228,7 +228,7 @@ public function setLogLevelFilterFromVerbose($verboseForLogger)
     /**
      * disable logging
      *
-     * @param TBD $logger
+     * @param string $logger
      *            (optional) default null = all loggers
      *            string representing a list of keys to access loggers map.
      *
@@ -248,7 +248,7 @@ public function disableLogging($logger = null)
     /**
      * enable logging
      *
-     * @param TBD $logger
+     * @param string $logger
      *            (optional) default null = all loggers
      *            string representing a list of keys to access loggers map.
      *

lib/functions/requirement_mgr.class.php

@@ -1015,9 +1015,9 @@ public function create_tc_from_requirement($mixIdReq, $srs_id, $user_id,
             // Warning:
             // We are not maintaining hierarchy !!!
             $sql = " SELECT id FROM {$this->tables['nodes_hierarchy']} NH " .
-                " WHERE name='" .
-                $this->db->prepare_string($auto_testsuite_name) . "' " .
-                " AND parent_id=" . $tproject_id . " " . " AND node_type_id=" .
+                " WHERE name='" . $this->db->prepare_string(
+                    $auto_testsuite_name) . "' " . " AND parent_id=" .
+                $tproject_id . " " . " AND node_type_id=" .
                 $node_descr_type['testsuite'];
 
             $result = $this->db->exec_query($sql);
@@ -4044,7 +4044,7 @@ private function updateScope($reqVersionID)
     /**
      * render Image Attachments INLINE
      */
-    private function renderImageAttachments($id, &$item2render, $basehref = null)
+    public function renderImageAttachments($id, &$item2render, $basehref = null)
     {
         static $attSet;
 

lib/functions/string_api.php

@@ -17,8 +17,9 @@
  * Preserve spaces at beginning of lines.
  * Lines must be separated by \n rather than < br / >
  */
-use const Collator\OFF;
-use const Collator\ON;
+use function database\db_unixtimestamp;
+
+require_once 'common.php';
 
 function string_preserve_spaces_at_bol($p_string)
 {
@@ -79,8 +80,8 @@ function string_nl2br($p_string, $p_wrap = 100)
         $pre2[$x] = preg_replace("/<br[^>]*?>/", "", $pre1[0][$x]);
         // this may want to be replaced by html_entity_decode (or equivalent)
         // if other encoded characters are a problem
-        $pre2[$x] = preg_replace("/&nbsp;/", " ", $pre2[$x]);
-        if (ON == config_get('wrap_in_preformatted_text')) {
+        $pre2[$x] = str_replace("/&nbsp;/", " ", $pre2[$x]);
+        if (tl::ON == config_get('wrap_in_preformatted_text')) {
             $pre2[$x] = preg_replace("/([^\n]{" . $p_wrap . "})(?!<\/pre>)/",
                 "$1\n", $pre2[$x]);
         }
@@ -354,7 +355,7 @@ function string_restore_valid_html_tags($p_string, $p_multiline = true)
     $t_html_valid_tags = config_get(
         $p_multiline ? 'html_valid_tags' : 'html_valid_tags_single_line');
 
-    if (OFF === $t_html_valid_tags || isBlank($t_html_valid_tags)) {
+    if (0 === $t_html_valid_tags || isBlank($t_html_valid_tags)) {
         return $p_string;
     }
 

lib/functions/testcase.class.php

@@ -9141,7 +9141,7 @@ public function getLatestVersionID($tcaseID)
      *
      * <p> </p> added by web rich editor create some layout issues
      */
-    private function renderBuildExecVars($context, &$item2render)
+    public function renderBuildExecVars($context, &$item2render)
     {
         static $execVars;
 

lib/functions/testsuite.class.php

@@ -1715,7 +1715,7 @@ private function getDeleteAttachmentRelativeURL($id)
      * <img alt="" src="http://localhost/development/tl/testlink-ga-testlink-code/lib/attachments/attachmentdownload.php?id=1"
      * style="width: 1223px; height: 666px;" />
      */
-    private function renderImageAttachments($id, &$item2render, $basehref = null)
+    public function renderImageAttachments($id, &$item2render, $basehref = null)
     {
         static $attSet;
         if (! $attSet || ! isset($attSet[$id])) {

lib/issuetrackerintegration/issueTrackerInterface.class.php

@@ -42,18 +42,18 @@ abstract class issueTrackerInterface
 
     // private vars don't touch
     // usable only if interface is done via direct DB access.
-    private $dbConnection = null;
+    public $dbConnection = null;
 
     private $dbMsg = '';
 
     // useful for connect/disconnect methods
-    private $interfaceViaDB = false;
+    public $interfaceViaDB = false;
 
-    private $connected = false;
+    public $connected = false;
 
-    private $resolvedStatus;
+    public $resolvedStatus;
 
-    private $methodOpt = array(
+    public $methodOpt = array(
         'buildViewBugLink' => array(
             'addSummary' => false,
             'colorByStatus' => false,

lib/results/charts.inc.php

@@ -12,9 +12,6 @@
 require_once '../../config.inc.php';
 require_once __DIR__ . '/../../vendor/autoload.php';
 
-use pChart\pChart;
-use pChart\pData;
-
 /**
  *
  * @param stdClass $info