Skip to content

Commit e296408

Browse files
DanProgsDanProgs
committed
Code revised with reactor
Applied rules: * StrictArraySearchRector * SplitDoubleAssignRector
1 parent 429d6e6 commit e296408

File tree

62 files changed

+267
-192
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+267
-192
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4052,8 +4052,9 @@ public function addTestCaseToTestPlan($args)
40524052
// Other version than requested done is already linked
40534053
$doLink = false;
40544054
if ($this->_isParamPresent(self::$overwriteParamName) &&
4055-
$this->args[self::$overwriteParamName]) {
4056-
$doLink = $doDeleteLinks = true;
4055+
$this->args[self::$overwriteParamName]) {
4056+
$doLink = true;
4057+
$doDeleteLinks = true;
40574058
}
40584059

40594060
reset($rs);

‎lib/execute/bugAdd.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,9 @@ function initEnv(&$dbHandler)
318318
case 'add_note':
319319
default:
320320
break;
321-
}
322-
323-
$gui->bug_notes = $args->bug_notes = trim($args->bug_notes);
321+
}
322+
$gui->bug_notes = trim($args->bug_notes);
323+
$args->bug_notes = $gui->bug_notes;
324324

325325
$args->basehref = $_SESSION['basehref'];
326326
$tables = tlObjectWithDB::getDBTables(array(

‎lib/execute/execDashboard.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,9 @@ function initializeGui(&$dbHandler, &$argsObj, &$cfgObj, &$tplanMgr)
167167
$platformMgr = new tlPlatform($dbHandler, $argsObj->tproject_id);
168168

169169
$gui = new stdClass();
170-
$gui->form_token = $argsObj->form_token;
171-
$gui->remoteExecFeedback = $gui->user_feedback = '';
170+
$gui->form_token = $argsObj->form_token;
171+
$gui->remoteExecFeedback = '';
172+
$gui->user_feedback = '';
172173
$gui->tplan_id = $argsObj->tplan_id;
173174
$gui->tproject_id = $argsObj->tproject_id;
174175
$gui->build_id = $argsObj->build_id;

‎lib/execute/execSetResults.php‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,9 +1506,9 @@ function initializeGui(&$dbHandler, &$argsObj, &$cfgObj, &$tplanMgr, &$tcaseMgr,
15061506

15071507
$gui->issueSummaryForStep = null;
15081508
$gui->addIssueOp = null;
1509-
$gui->allowStepAttachments = true;
1510-
1511-
$gui->remoteExecFeedback = $gui->user_feedback = '';
1509+
$gui->allowStepAttachments = true;
1510+
$gui->remoteExecFeedback = '';
1511+
$gui->user_feedback = '';
15121512
$gui->tplan_id = $argsObj->tplan_id;
15131513
$gui->tproject_id = $argsObj->tproject_id;
15141514
$gui->build_id = $argsObj->build_id;
@@ -2261,9 +2261,9 @@ function getLinkedItems($argsObj, $historyOn, $cfgObj, $tcaseMgr, $tplanMgr,
22612261
// before this refactoring
22622262
//
22632263
// $tex = $tcaseMgr->db->$kmethod($sql2run,'tcase_id',database::CUMULATIVE);
2264-
$sql2run .= ' ORDER BY exec_order ';
2265-
2266-
$ltcv = $tex = $tcaseMgr->db->$kmethod($sql2run, 'tcase_id');
2264+
$sql2run .= ' ORDER BY exec_order ';
2265+
$ltcv = $tcaseMgr->db->$kmethod($sql2run, 'tcase_id');
2266+
$tex = $ltcv;
22672267
if (! is_null($tex)) {
22682268
// We need to create:
22692269
// one set for Custom fields that apply to DESIGN
@@ -2565,8 +2565,9 @@ function initExecValuesMenus($tcStatusCfg, $execStatusToExclude)
25652565
{
25662566
$remove = array(
25672567
$tcStatusCfg['not_run']
2568-
);
2569-
$execStatusTestCase = $execStatusTestCaseStep = createResultsMenu($remove);
2568+
);
2569+
$execStatusTestCase = createResultsMenu($remove);
2570+
$execStatusTestCaseStep = $execStatusTestCase;
25702571

25712572
foreach ($execStatusToExclude['testcase'] as $code) {
25722573
if (isset($execStatusTestCase[$code])) {

‎lib/functions/cfield_mgr.class.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2926,8 +2926,9 @@ public function initViewGUI()
29262926
$gogo->cfield_is_linked = 0;
29272927
$gogo->linked_tprojects = null;
29282928

2929-
$gogo->cf_map = $this->get_all(null, 'transform');
2930-
$gogo->cf_types = $gogo->cfield_types = $this->get_available_types();
2929+
$gogo->cf_map = $this->get_all(null, 'transform');
2930+
$gogo->cf_types = $this->get_available_types();
2931+
$gogo->cfield_types = $gogo->cf_types;
29312932

29322933
// MAGIC 10
29332934
$gogo->drawControlsOnTop = (null != $gogo->cf_map &&

‎lib/functions/code_testing/requirement_mgr.class.test.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
$reqID = 18;
3030
$reqVersionID = 19;
3131
$value = 0;
32-
echo "<pre> {$method2test} - ${$method2test}(&\$reqVersionID,\$value)";
32+
echo "<pre> {$method2test} - {${$method2test}}(&\$reqVersionID,\$value)";
3333
echo "</pre>";
34-
echo "<pre> {$method2test} - ${$method2test}({$reqVersionID},{$value})";
34+
echo "<pre> {$method2test} - {${$method2test}}({$reqVersionID},{$value})";
3535
echo "</pre>";
3636

3737
$obj_mgr->$method2test($reqVersionID, $value);
@@ -42,9 +42,9 @@
4242
$reqID = 18;
4343
$reqVersionID = 19;
4444
$value = 1;
45-
echo "<pre> {$method2test} - ${$method2test}(&\$reqVersionID,\$value)";
45+
echo "<pre> {$method2test} - {${$method2test}}(&\$reqVersionID,\$value)";
4646
echo "</pre>";
47-
echo "<pre> {$method2test} - ${$method2test}({$reqVersionID},{$value})";
47+
echo "<pre> {$method2test} - {${$method2test}}({$reqVersionID},{$value})";
4848
echo "</pre>";
4949

5050
$obj_mgr->$method2test($reqVersionID, $value);
@@ -55,9 +55,9 @@
5555
$reqID = 18;
5656
$reqVersionID = 19;
5757
$value = 0;
58-
echo "<pre> {$method2test} - ${$method2test}(&\$reqVersionID,\$value)";
58+
echo "<pre> {$method2test} - {${$method2test}}(&\$reqVersionID,\$value)";
5959
echo "</pre>";
60-
echo "<pre> {$method2test} - ${$method2test}({$reqVersionID},{$value})";
60+
echo "<pre> {$method2test} - {${$method2test}}({$reqVersionID},{$value})";
6161
echo "</pre>";
6262

6363
$obj_mgr->$method2test($reqVersionID, $value);
@@ -68,9 +68,9 @@
6868
$reqID = 18;
6969
$reqVersionID = 19;
7070
$value = 1000;
71-
echo "<pre> {$method2test} - ${$method2test}(&\$reqVersionID,\$value)";
71+
echo "<pre> {$method2test} - {${$method2test}}(&\$reqVersionID,\$value)";
7272
echo "</pre>";
73-
echo "<pre> {$method2test} - ${$method2test}({$reqVersionID},{$value})";
73+
echo "<pre> {$method2test} - {${$method2test}}({$reqVersionID},{$value})";
7474
echo "</pre>";
7575

7676
$obj_mgr->$method2test($reqVersionID, $value);
@@ -81,9 +81,9 @@
8181
$reqID = 18;
8282
$reqVersionID = 19;
8383
$value = null;
84-
echo "<pre> {$method2test} - ${$method2test}(&\$reqVersionID,\$value)";
84+
echo "<pre> {$method2test} - {${$method2test}}(&\$reqVersionID,\$value)";
8585
echo "</pre>";
86-
echo "<pre> {$method2test} - ${$method2test}({$reqVersionID},{$value})";
86+
echo "<pre> {$method2test} - {${$method2test}}({$reqVersionID},{$value})";
8787
echo "</pre>";
8888

8989
$obj_mgr->$method2test($reqVersionID, $value);
@@ -94,9 +94,9 @@
9494
$reqID = 18;
9595
$reqVersionID = 19;
9696
$value = "one";
97-
echo "<pre> {$method2test} - ${$method2test}(&\$reqVersionID,\$value)";
97+
echo "<pre> {$method2test} - {${$method2test}}(&\$reqVersionID,\$value)";
9898
echo "</pre>";
99-
echo "<pre> {$method2test} - ${$method2test}({$reqVersionID},{$value})";
99+
echo "<pre> {$method2test} - {${$method2test}}({$reqVersionID},{$value})";
100100
echo "</pre>";
101101

102102
$obj_mgr->$method2test($reqVersionID, $value);
@@ -107,9 +107,9 @@
107107
$reqID = 18;
108108
$reqVersionID = 19;
109109
$value = array();
110-
echo "<pre> {$method2test} - ${$method2test}(&\$reqVersionID,\$value)";
110+
echo "<pre> {$method2test} - {${$method2test}}(&\$reqVersionID,\$value)";
111111
echo "</pre>";
112-
echo "<pre> {$method2test} - ${$method2test}({$reqVersionID},{$value})";
112+
echo "<pre> {$method2test} - {${$method2test}}({$reqVersionID},{$value})";
113113
echo "</pre>";
114114

115115
$obj_mgr->$method2test($reqVersionID, $value);
@@ -120,9 +120,9 @@
120120
$reqID = 18;
121121
$reqVersionID = 19;
122122
$value = - 18;
123-
echo "<pre> {$method2test} - ${$method2test}(&\$reqVersionID,\$value)";
123+
echo "<pre> {$method2test} - {${$method2test}}(&\$reqVersionID,\$value)";
124124
echo "</pre>";
125-
echo "<pre> {$method2test} - ${$method2test}({$reqVersionID},{$value})";
125+
echo "<pre> {$method2test} - {${$method2test}}({$reqVersionID},{$value})";
126126
echo "</pre>";
127127

128128
$obj_mgr->$method2test($reqVersionID, $value);
@@ -133,9 +133,9 @@
133133
$reqID = 18;
134134
$reqVersionID = 19;
135135
$value = false;
136-
echo "<pre> {$method2test} - ${$method2test}(&\$reqVersionID,\$value)";
136+
echo "<pre> {$method2test} - {${$method2test}}(&\$reqVersionID,\$value)";
137137
echo "</pre>";
138-
echo "<pre> {$method2test} - ${$method2test}({$reqVersionID},{$value})";
138+
echo "<pre> {$method2test} - {${$method2test}}({$reqVersionID},{$value})";
139139
echo "</pre>";
140140

141141
$obj_mgr->$method2test($reqVersionID, $value);

‎lib/functions/code_testing/requirement_spec_mgr.class.test.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
$item['log_message'] = 'This is a log message';
3333
$item['author_id'] = 1;
3434

35-
echo "<pre> {$method2test} - ${$method2test}(&\$rspecID,&\$item,)";
35+
echo "<pre> {$method2test} - {${$method2test}}(&\$rspecID,&\$item,)";
3636
echo "</pre>";
3737

3838
new dBug($obj_mgr->$method2test($rspecID, $item));

‎lib/functions/common.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1623,9 +1623,9 @@ function initUserEnv(&$dbH, $context, $opt = null)
16231623
$gui->tplan_id = intval($args->tplan_id);
16241624

16251625
if ($gui->tproject_id > 0) {
1626-
// Force to avoid lot of processing
1627-
$gui->hasTestCases = $gui->hasKeywords = true;
1628-
1626+
// Force to avoid lot of processing
1627+
$gui->hasTestCases = true;
1628+
$gui->hasKeywords = true;
16291629
$gui->num_active_tplans = $tprjMgr->getActiveTestPlansCount(
16301630
$args->tproject_id);
16311631

@@ -1643,8 +1643,9 @@ function initUserEnv(&$dbH, $context, $opt = null)
16431643
* $gui->tplan_id = $args->tplan_id = (int)doTestPlanSetup($gui);
16441644
* }
16451645
*/
1646-
if ($args->tplan_id <= 0) {
1647-
$gui->tplan_id = $args->tplan_id = (int) doTestPlanSetup($gui);
1646+
if ($args->tplan_id <= 0) {
1647+
$gui->tplan_id = (int) doTestPlanSetup($gui);
1648+
$args->tplan_id = (int) doTestPlanSetup($gui);
16481649
}
16491650
}
16501651

‎lib/functions/csv.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ function importCSVData($fileName, $fieldMappings, $options = null)
142142
$needle = $k;
143143
$dest = $targetKey;
144144
}
145-
$t = array_search($needle, $data);
145+
$t = array_search($needle, $data, true);
146146
$keyMappings[$t] = $dest;
147147
}
148148
} else {

‎lib/functions/requirements.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ function executeImportedReqs(&$db, $arrImportSource, $map_cur_reqdoc_id,
6565
$import_status = lang_get('req_import_result_skipped');
6666
} else {
6767
$crash = $map_cur_reqdoc_id &&
68-
array_search($docID, $map_cur_reqdoc_id);
68+
array_search($docID, $map_cur_reqdoc_id, true);
6969
if ($crash) {
7070
// process conflict according to choosen solution
7171
tLog('Conflict found. solution: ' . $conflictSolution);

0 commit comments

Comments
 (0)