Skip to content

[Core: Utility] Add type declarations to function signatures #4046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
driusan merged 9 commits into from
Nov 12, 2018
Merged

[Core: Utility] Add type declarations to function signatures #4046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fddaf46
Use type declarations where possible
johnsaigle Oct 31, 2018
72814c3
phpcs
johnsaigle Oct 31, 2018
d7f5a26
Declar strict types
johnsaigle Oct 31, 2018
35b911b
Fix typo
Oct 31, 2018
c1bfc81
CheckDate should have string param
johnsaigle Oct 31, 2018
2266902
Change subprojectIDs function to return int, not array
johnsaigle Oct 31, 2018
411c64c
Melanie's feedback
johnsaigle Nov 5, 2018
7330cf6
Fix calls to Utility in stats module
johnsaigle Nov 5, 2018
83472ab
Melanie's feedback
johnsaigle Nov 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions modules/statistics/php/stats_behavioural.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,22 +112,24 @@ class Stats_Behavioural extends \NDB_Form
$currentProject = '';
$Param_Project = '';
}

$subprojects = \Utility::getSubprojectsForProject($currentProject);

$this->tpl_data['Subprojects'] = $subprojects;
foreach ($subprojects as $key=>$val) {
$subprojList .= $key.",";
}
$subprojList = substr($subprojList, 0, -1);
if (!empty($subprojList)) {
$suproject_query ="AND s.SubprojectID IN ($subprojList)";
} else {
$suproject_query ='';
//
//SUBPROJECTS
$suproject_query = '';
// Only search for subprojects if $currentProject is a positive int.
if (is_numeric($currentProject) && intval($currentProject) >= 0) {
$subprojList ="";
$subprojects = \Utility::getSubprojectsForProject($currentProject);
foreach ($subprojects as $key=>$val) {
$subprojList .= $key.",";
}
$subprojList = substr($subprojList, 0, -1);
if (!empty($subprojList)) {
$suproject_query ="AND s.SubprojectID IN ($subprojList)";
}
$Visits = \Utility::getExistingVisitLabels($currentProject);
}

$Visits = \Utility::getExistingVisitLabels($currentProject);
$this->tpl_data['Visits'] = $Visits;
$this->tpl_data['Visits'] = $Visits ?? '';

//---- BEHAVIORAL STATS -----
$result = $DB->pselect(
Expand Down
22 changes: 12 additions & 10 deletions modules/statistics/php/stats_demographic.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,16 +187,18 @@ class Stats_Demographic extends \NDB_Form
}

//SUBPROJECTS
$subprojList ="";
$subprojects = \Utility::getSubprojectsForProject($currentProject);
foreach ($subprojects as $key=>$val) {
$subprojList .= $key.",";
}
$subprojList = substr($subprojList, 0, -1);
if (!empty($subprojList)) {
$suproject_query ="AND s.SubprojectID IN ($subprojList)";
} else {
$suproject_query ='';
$suproject_query = '';
// Only search for subprojects if $currentProject is a positive int.
if (is_numeric($currentProject) && intval($currentProject) >= 0) {
$subprojList ="";
$subprojects = \Utility::getSubprojectsForProject($currentProject);
foreach ($subprojects as $key=>$val) {
$subprojList .= $key.",";
}
$subprojList = substr($subprojList, 0, -1);
if (!empty($subprojList)) {
$suproject_query ="AND s.SubprojectID IN ($subprojList)";
}
}

//SITES
Expand Down
Loading