From fddaf46a6d6f1754b5122a63dc9cf196896e0e8e Mon Sep 17 00:00:00 2001
From: John Saigle <john.saigle@gmail.com>
Date: Wed, 31 Oct 2018 11:47:48 -0400
Subject: [PATCH 1/9] Use type declarations where possible

---
 php/libraries/Utility.class.inc | 164 +++++++++++++++++---------------
 1 file changed, 88 insertions(+), 76 deletions(-)

diff --git a/php/libraries/Utility.class.inc b/php/libraries/Utility.class.inc
index 413f2900b7a..500b944b764 100644
--- a/php/libraries/Utility.class.inc
+++ b/php/libraries/Utility.class.inc
@@ -38,17 +38,18 @@ class Utility
      * @param string $dob      date of birth (or first date), formatted YYYY-MM-DD
      * @param string $testdate date of testing (or second date), formatted YYYY-MM-DD
      *
-     * @return mixed an array with keys 'year', 'mon', 'day' containing the
-     *               computed age, or a PEAR::Error object
+     * @return array containing keys 'year', 'mon', 'day' containing the
+     *               computed age
+     * @throws LorisException
      */
-    static function calculateAge($dob, $testdate)
+    static function calculateAge($dob, $testdate): array
     {
         if (!preg_match(
             "/([0-9]{4})-?([0-9]{1,2})-?([0-9]{1,2})/",
             $dob,
             $matches
         )) {
-            throw new Exception(
+            throw new \LorisException(
                 "Argument 1 does not match expected date format (YYYY-MM-DD)"
             );
         }
@@ -63,7 +64,7 @@ class Utility
             $testdate,
             $matches
         )) {
-            throw new Exception(
+            throw new \LorisException(
                 "Argument 2 does not match expected date format (YYYY-MM-DD)"
             );
         }
@@ -96,7 +97,7 @@ class Utility
      * @return array An associative array of consents, with their names and labels.
      *               The keys of the arrays are the IDs of the consents
      */
-    static function getConsentList()
+    static function getConsentList(): array
     {
         $factory = NDB_Factory::singleton();
         $DB      = $factory->database();
@@ -117,9 +118,9 @@ class Utility
      *
      * @return array an associative array("center ID" => "site name")
      */
-    static function getSiteList($study_site = true)
+    static function getSiteList(bool $study_site = true): array
     {
-        $DB =& Database::singleton();
+        $DB =& \Database::singleton();
 
         // get the list of study sites - to be replaced by the Site object
         $query = "SELECT CenterID, Name FROM psc ";
@@ -150,9 +151,11 @@ class Utility
      *         should be interpreted as an associative array since the keys
      *         refer to the centerID, not the array index.
      */
-    static function getAssociativeSiteList($study_site = true, $DCC = true)
-    {
-        $DB =& Database::singleton();
+    static function getAssociativeSiteList(
+        bool $study_site = true,
+        bool $DCC = true
+    ): array {
+        $DB =& \Database::singleton();
 
         // get the list of study sites - to be replaced by the Site object
         $query = "SELECT CenterID, Name FROM psc ";
@@ -181,7 +184,7 @@ class Utility
      */
     static function getVisitList() : array
     {
-        $DB =& Database::singleton();
+        $DB =& \Database::singleton();
 
         $query = "SELECT Visit_label from Visit_Windows ORDER BY Visit_label";
 
@@ -200,9 +203,9 @@ class Utility
      * @return array an associative array("projectID" => "project title")
      * @access public
      */
-    static function getProjectList()
+    static function getProjectList(): array
     {
-        $factory = NDB_Factory::singleton();
+        $factory = \NDB_Factory::singleton();
         $DB      = $factory->database();
         // get the list of projects
         $projects = $DB->pselect("SELECT * FROM Project", array());
@@ -216,12 +219,12 @@ class Utility
     /**
      * Returns a list of study Subprojects
      *
-     * @param integer $projectID The project for which you would like
+     * @param integer|null $projectID The project for which you would like
      *                           to get the subprojects
      *
      * @return array       an associative array("SubprojectID" => "Subproject title")
      */
-    static function getSubprojectList($projectID = null)
+    static function getSubprojectList(int $projectID = null): array
     {
         $factory = NDB_Factory::singleton();
         $DB      = $factory->database();
@@ -251,7 +254,7 @@ class Utility
      *
      * @return array an associative array("SubprojectID" => "Subproject title")
      */
-    static function getSubprojectsForProject($projectID = null)
+    static function getSubprojectsForProject(int $projectID): array
     {
         return self::getSubprojectList($projectID);
     }
@@ -267,9 +270,9 @@ class Utility
      *       NDB_BVL_Instrument
      * @cleanup
      */
-    static function getTestNameByCommentID($commentID)
+    static function getTestNameByCommentID(string $commentID): string
     {
-        $db =& Database::singleton();
+        $db =& \Database::singleton();
 
         $query    = "SELECT Test_name FROM flag WHERE CommentID=:CID";
         $testName = $db->pselectOne($query, array('CID' => $commentID));
@@ -285,7 +288,7 @@ class Utility
      * @return string The string cleaned up enough to be used as a
      *                variable name
      */
-    static function getCleanString($string)
+    static function getCleanString(string $string): string
     {
         $string = trim($string);
         $string = str_replace('  ', ' ', $string);
@@ -301,8 +304,8 @@ class Utility
      * Transforms a config structure (such as in PSCID) into a
      * Perl-compatible regex expression for validation
      *
-     * @param array  $structure  the structure root
-     * @param string $siteAbbrev the site abbreviation, sometimes used as part
+     * @param array       $structure  the structure root
+     * @param string|null $siteAbbrev the site abbreviation, sometimes used as part
      *                           of the PSCID
      *
      * @return string the regex pattern
@@ -312,8 +315,10 @@ class Utility
      * @note    This should be removed when user-generated PSCID support is removed
      * @cleanup
      */
-    static function structureToPCRE($structure, $siteAbbrev=null)
-    {
+    static function structureToPCRE(
+        array $structure,
+        ?string $siteAbbrev = null
+    ): string {
         $seqs = $structure['seq'];
         // handle the situation where there exists only one seq
         if (isset($seqs['#'])) {
@@ -387,19 +392,19 @@ class Utility
      * a set of 2 or more sibling elements with the same name, then
      * the entire set will be replaced rather than recursively merged.
      *
-     * @param array $array1       The first array to be merged
-     * @param array $array2       The second array to be merged
-     * @param array $merged_array A reference to an array to merge
+     * @param array      $array1       The first array to be merged
+     * @param array      $array2       The second array to be merged
+     * @param array|null $merged_array A reference to an array to merge
      *                            the parameters into. If not specified,
      *                            a new array will be created
      *
      * @return array with the two parameters recursively merged
      */
     static function arrayMergeRecursiveOverwriting(
-        $array1,
-        $array2,
-        &$merged_array=null
-    ) {
+        array $array1,
+        array $array2,
+        ?array &$merged_array = null
+    ): array {
         if (empty($merged_array)) {
             $merged_array = $array1;
         }
@@ -425,14 +430,14 @@ class Utility
      * Returns a list of instruments for a timepoint's stage ($stage).
      * If no stage arg is passed, return the full list for all stages
      *
-     * @param integer $age   age in days
-     * @param string  $stage study stage (screening or visit)
+     * @param integer     $age   age in days
+     * @param string|null $stage study stage (screening or visit)
      *
      * @return array list of instruments
      */
-    static function lookupBattery($age, $stage=null)
+    static function lookupBattery(int $age, string $stage = null): array
     {
-        $DB =& Database::singleton();
+        $DB =& \Database::singleton();
 
         // craft the select query
         $query  = "SELECT t.Test_name FROM test_battery AS b, test_names AS t
@@ -475,7 +480,7 @@ class Utility
      *
      * @return array If $var is an array, var, otherwise an array containing $var
      */
-    static function toArray($var)
+    static function toArray($var): array
     {
         if (is_array($var) && !array_key_exists(0, $var)) {
             $var = array($var);
@@ -494,7 +499,7 @@ class Utility
      * @cleanup This should be removed and all uses converted to toArray
      *          (or vice versa, but toArray seems to be more common in the code)
      */
-    static function asArray($var)
+    static function asArray($var): array
     {
         if (!is_array($var)) {
             return array($var);
@@ -522,7 +527,7 @@ class Utility
      *
      * @return array The same array passed in, after modifications.
      */
-    public static function nullifyEmpty(&$arr, $field)
+    public static function nullifyEmpty(array &$arr, string $field): array
     {
         if ($arr[$field] === '') {
             $arr[$field] = null;
@@ -535,7 +540,7 @@ class Utility
      *
      * @return array of the form Test_name => Full Description
      */
-    static function getAllInstruments()
+    static function getAllInstruments(): array
     {
         $Factory       = NDB_Factory::singleton();
         $DB            = $Factory->Database();
@@ -558,11 +563,11 @@ class Utility
      *
      * @return array of the form Test_name => Full Description
      */
-    static function getAllDDEInstruments()
+    static function getAllDDEInstruments(): array
     {
-        $Factory       = NDB_Factory::singleton();
+        $Factory       = \NDB_Factory::singleton();
         $DB            = $Factory->Database();
-        $config        =& NDB_Config::singleton();
+        $config        =& \NDB_Config::singleton();
         $instruments_q = $DB->pselect(
             "SELECT Test_name,Full_name FROM test_names",
             array()
@@ -590,9 +595,9 @@ class Utility
      *
      * @return array of test_names in a Test_Name => "Full Name"
      */
-    static function getDirectInstruments()
+    static function getDirectInstruments(): array
     {
-        $DB            =& Database::singleton();
+        $DB            =& \Database::singleton();
         $instruments   = array();
         $instruments_q = $DB->pselect(
             "SELECT Test_name,Full_name FROM test_names WHERE IsDirectEntry=true",
@@ -611,13 +616,13 @@ class Utility
      *
      * @return array non-associative array of test_names
      */
-    static function getScoredInstruments()
+    static function getScoredInstruments(): array
     {
-        $All     = Utility::getAllInstruments();
+        $All     = \Utility::getAllInstruments();
         $Scored  = array();
         $Nothing = array();
         foreach (array_keys($All) as $Instrument) {
-            if (Utility::getScoreColsForInstrument($Instrument) != $Nothing) {
+            if (\Utility::getScoreColsForInstrument($Instrument) != $Nothing) {
                 $Scored[] = $Instrument;
             }
         }
@@ -632,7 +637,7 @@ class Utility
      *
      * @return array (non-associative) of scored columns for the instrument given
      */
-    static function getScoreColsForInstrument($inst)
+    static function getScoreColsForInstrument(string $inst): array
     {
         include_once "NDB_BVL_Instrument.class.inc";
         $i = NDB_BVL_Instrument::factory($inst, '', '', true);
@@ -662,14 +667,14 @@ class Utility
      * @return boolean true if the table has at least one NULL in the column
      * @note   This should really be in the Database.class.inc file... -anyhowstep
      */
-    static function columnsHasNull($table_name,$column)
+    static function columnsHasNull(string $table_name, string $column): bool
     {
         //$config   =& NDB_Config::singleton();
         //$database = $config->getSetting('database');
         $query    = "SELECT count(*)
             FROM {$table_name}
             WHERE {$column} is NULL";
-        $DB       =& Database::singleton();
+        $DB       =& \Database::singleton();
         $num_null = $DB->pselectOne(
             $query,
             array()
@@ -688,9 +693,9 @@ class Utility
      * @return array
      * @throws DatabaseException
      */
-    static function getStageUsingCandID($Cand_id)
+    static function getStageUsingCandID(string $Cand_id): array
     {
-        $db    =& Database::singleton();
+        $db    =& \Database::singleton();
         $query = "select DISTINCT Current_stage from session where ".
             "CandID = :Cand_id";
         $stage = $db->pselect($query, array('Cand_id' => $Cand_id));
@@ -705,9 +710,9 @@ class Utility
      * @return array
      * @throws DatabaseException
      */
-    static function getSubprojectIDUsingCandID($Cand_id)
+    static function getSubprojectIDUsingCandID(string $Cand_id): array
     {
-        $db    =& Database::singleton();
+        $db    =& \Database::singleton();
         $query = "select DISTINCT SubprojectID from session where CandID = :CandID";
         $stage = $db->pselect($query, array('CandID' => $Cand_id));
         return $stage[0]['SubprojectID'];
@@ -724,10 +729,10 @@ class Utility
      * @note    Function comment written by Dave, not the author of this function.
      * @cleanup
      */
-    static function getTestNameUsingFullName($fullname): string
+    static function getTestNameUsingFullName(string $fullname): string
     {
         $test_name  = '';
-        $db         =& Database::singleton();
+        $db         =& \Database::singleton();
         $instrument = $db->pselect(
             "SELECT Test_name FROM test_names WHERE Full_name =:fname",
             array('fname' => $fullname)
@@ -741,11 +746,11 @@ class Utility
     /**
      * Returns all the sourcefrom instruments from parameter_type
      *
-     * @param string $instrument If specified, return fields from this
+     * @param string|null $instrument If specified, return fields from this
      *                           test_name
-     * @param string $commentID  If specified, return fields for this
+     * @param string|null $commentID  If specified, return fields for this
      *                           commentid
-     * @param string $name       If specified, return fields for this
+     * @param string|null $name       If specified, return fields for this
      *                           parameter_type name
      *
      * @return  Array of the form array(
@@ -760,9 +765,13 @@ class Utility
      * @note    Function comment written by Dave, not the author of this function.
      * @cleanup
      */
-    static function getSourcefields($instrument=null,$commentID=null,$name=null)
-    {
-        $DB =& Database::singleton();
+    static function getSourcefields(
+        ?string $instrument = null,
+        ?string $commentID = null,
+        ?string $name = null
+    ): array {
+    
+        $DB =& \Database::singleton();
         //get sourcefield using instrument
         if (!is_null($instrument)) {
             $sourcefields = $DB->pselect(
@@ -795,7 +804,8 @@ class Utility
     /**
      * Returns a list of study Visit Labels that are being used by this study.
      *
-     * @param integer $projectID Limit visit labels to labels used by this project
+     * @param integer|null $projectID Limit visit labels to labels used by this 
+     *                                  project.
      *
      * @return array of study visits in the format array('VL' => 'VL')
      *         where VL is the visit label
@@ -807,9 +817,9 @@ class Utility
      * @vulnerable
      * @cleanup
      */
-    static function getExistingVisitLabels($projectID = null)
+    static function getExistingVisitLabels(int $projectID = null): array
     {
-        $factory = NDB_Factory::singleton();
+        $factory = \NDB_Factory::singleton();
         $db      = $factory->database();
         $qparams = array();
 
@@ -855,9 +865,9 @@ class Utility
      *      - data_team_helper/ajax/GetInstruments.php
      * @cleanup
      */
-    static function getVisitInstruments($visit_label)
+    static function getVisitInstruments(string $visit_label): array
     {
-        $DB =& Database::singleton();
+        $DB =& \Database::singleton();
 
         if ($DB->ColumnExists('test_battery', 'Test_name_display')) {
             $test_names = $DB->pselect(
@@ -892,7 +902,7 @@ class Utility
      *                 numeric keys, false otherwise.
      * @note   Fix this in future, checking $arr[0] is naive
      */
-    static function numericArray($arr)
+    static function numericArray(array $arr): bool
     {
         if (!is_array($arr)) {
             return false;
@@ -926,8 +936,10 @@ class Utility
      *
      * @return string $prefixStr minus the largest common piece of $suffixStr
      */
-    static function removeCommonAffix($suffixStr, $prefixStr)
-    {
+    static function removeCommonAffix(
+        string $suffixStr,
+        string $prefixStr
+    ): string {
         $lastFound = '';
         // Start from the end of $suffixStr and work backwords, to make sure
         // it fails fast in the event that there's nothing in common.
@@ -960,7 +972,7 @@ class Utility
     *
     * @return string CSV string of data
     */
-    static function arrayToCSV($array)
+    static function arrayToCSV(array $array): string
     {
         $fp = fopen("php://temp", 'w+');
 
@@ -986,7 +998,7 @@ class Utility
      *
      * @return True if the date is invalid, false if it's valid.
      */
-    static function _checkDate($dateElement)
+    static function _checkDate(array $dateElement): bool
     {
         if (empty($dateElement['M'])
             && empty($dateElement['d'])
@@ -1013,7 +1025,7 @@ class Utility
      *
      * @return string $resolvedPath a path containing no .. sequences
      */
-    static function resolvePath($path)
+    static function resolvePath(string $path): string
     {
         $resolvedPath = array();
         // do some normalization
@@ -1043,7 +1055,7 @@ class Utility
      *
      * @return string smaller value of upload_max_filesize or post_max_size
      */
-    static function getMaxUploadSize()
+    static function getMaxUploadSize(): string
     {
         $umf = ini_get('upload_max_filesize');
         $pms = ini_get('post_max_size');
@@ -1060,7 +1072,7 @@ class Utility
      *
      * @note taken from http://php.net/manual/en/function.ini-get.php
      */
-    static function returnBytes($val)
+    static function returnBytes(string $val)
     {
         $val  = trim($val);
         $last = strtolower($val[strlen($val)-1]);
@@ -1084,7 +1096,7 @@ class Utility
      *               array is of the form
      *               array($language_id => $language_label)
      */
-    static function getLanguageList()
+    static function getLanguageList(): array
     {
         $DB = \Database::singleton();
 

From 72814c38bbd4178288f07e1326cce435fd3c52db Mon Sep 17 00:00:00 2001
From: John Saigle <john.saigle@gmail.com>
Date: Wed, 31 Oct 2018 13:19:43 -0400
Subject: [PATCH 2/9] phpcs

---
 php/libraries/Utility.class.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/php/libraries/Utility.class.inc b/php/libraries/Utility.class.inc
index 500b944b764..e04268a9ba3 100644
--- a/php/libraries/Utility.class.inc
+++ b/php/libraries/Utility.class.inc
@@ -770,7 +770,7 @@ class Utility
         ?string $commentID = null,
         ?string $name = null
     ): array {
-    
+
         $DB =& \Database::singleton();
         //get sourcefield using instrument
         if (!is_null($instrument)) {
@@ -804,7 +804,7 @@ class Utility
     /**
      * Returns a list of study Visit Labels that are being used by this study.
      *
-     * @param integer|null $projectID Limit visit labels to labels used by this 
+     * @param integer|null $projectID Limit visit labels to labels used by this
      *                                  project.
      *
      * @return array of study visits in the format array('VL' => 'VL')

From d7f5a265a2ab0bde6e68a7ca7cd75f6ce50c0bf5 Mon Sep 17 00:00:00 2001
From: John Saigle <john.saigle@gmail.com>
Date: Wed, 31 Oct 2018 15:11:50 -0400
Subject: [PATCH 3/9] Declar strict types

---
 php/libraries/Utility.class.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/libraries/Utility.class.inc b/php/libraries/Utility.class.inc
index e04268a9ba3..c866ff00d85 100644
--- a/php/libraries/Utility.class.inc
+++ b/php/libraries/Utility.class.inc
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1)
 /**
  * This file contains any static helper functions used by Loris that don't
  * fit elsewhere or are used in many different modules.

From 35b911bb36e22fda20de8436514c0de7e8b3d344 Mon Sep 17 00:00:00 2001
From: John Saigle <jsaigle.mcin@gmail.com>
Date: Wed, 31 Oct 2018 15:26:43 -0400
Subject: [PATCH 4/9] Fix typo

---
 php/libraries/Utility.class.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/libraries/Utility.class.inc b/php/libraries/Utility.class.inc
index c866ff00d85..8d3642543d4 100644
--- a/php/libraries/Utility.class.inc
+++ b/php/libraries/Utility.class.inc
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1)
+<?php declare(strict_types=1);
 /**
  * This file contains any static helper functions used by Loris that don't
  * fit elsewhere or are used in many different modules.

From c1bfc81c84b9dac14f3288e71f245dee058ed848 Mon Sep 17 00:00:00 2001
From: John Saigle <john.saigle@gmail.com>
Date: Wed, 31 Oct 2018 16:25:00 -0400
Subject: [PATCH 5/9] CheckDate should have string param

---
 php/libraries/Utility.class.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/php/libraries/Utility.class.inc b/php/libraries/Utility.class.inc
index 8d3642543d4..d02049883d2 100644
--- a/php/libraries/Utility.class.inc
+++ b/php/libraries/Utility.class.inc
@@ -690,10 +690,10 @@ class Utility
      *
      * @param string $Cand_id candidate ID
      *
-     * @return array
+     * @return string
      * @throws DatabaseException
      */
-    static function getStageUsingCandID(string $Cand_id): array
+    static function getStageUsingCandID(string $Cand_id): string
     {
         $db    =& \Database::singleton();
         $query = "select DISTINCT Current_stage from session where ".
@@ -994,11 +994,11 @@ class Utility
      * This is used by create timepoint and start timepoint pages,
      * so it probably shouldn't be in the instrument class.
      *
-     * @param array $dateElement The date element in QuickForm array format.
+     * @param string $dateElement The date element in QuickForm array format.
      *
      * @return True if the date is invalid, false if it's valid.
      */
-    static function _checkDate(array $dateElement): bool
+    static function _checkDate(string $dateElement): bool
     {
         if (empty($dateElement['M'])
             && empty($dateElement['d'])

From 226690279cfaf9bd8eff69c9e912226f88abc3e1 Mon Sep 17 00:00:00 2001
From: John Saigle <john.saigle@gmail.com>
Date: Wed, 31 Oct 2018 17:37:01 -0400
Subject: [PATCH 6/9] Change subprojectIDs function to return int, not array

---
 php/libraries/Utility.class.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/php/libraries/Utility.class.inc b/php/libraries/Utility.class.inc
index d02049883d2..c4a88beeded 100644
--- a/php/libraries/Utility.class.inc
+++ b/php/libraries/Utility.class.inc
@@ -707,15 +707,15 @@ class Utility
      *
      * @param string $Cand_id candidate ID
      *
-     * @return array
+     * @return int
      * @throws DatabaseException
      */
-    static function getSubprojectIDUsingCandID(string $Cand_id): array
+    static function getSubprojectIDUsingCandID(string $Cand_id): int
     {
         $db    =& \Database::singleton();
         $query = "select DISTINCT SubprojectID from session where CandID = :CandID";
         $stage = $db->pselect($query, array('CandID' => $Cand_id));
-        return $stage[0]['SubprojectID'];
+        return intval($stage[0]['SubprojectID']);
     }
 
     /**

From 411c64c3092468c1244a87868cb5005a035a6877 Mon Sep 17 00:00:00 2001
From: John Saigle <john.saigle@gmail.com>
Date: Mon, 5 Nov 2018 12:11:40 -0500
Subject: [PATCH 7/9] Melanie's feedback

---
 php/libraries/Utility.class.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/php/libraries/Utility.class.inc b/php/libraries/Utility.class.inc
index c4a88beeded..973de0c13d7 100644
--- a/php/libraries/Utility.class.inc
+++ b/php/libraries/Utility.class.inc
@@ -42,7 +42,7 @@ class Utility
      *               computed age
      * @throws LorisException
      */
-    static function calculateAge($dob, $testdate): array
+    static function calculateAge(string $dob, string $testdate): array
     {
         if (!preg_match(
             "/([0-9]{4})-?([0-9]{1,2})-?([0-9]{1,2})/",
@@ -435,7 +435,7 @@ class Utility
      *
      * @return array list of instruments
      */
-    static function lookupBattery(int $age, string $stage = null): array
+    static function lookupBattery(int $age, ?string $stage = null): array
     {
         $DB =& \Database::singleton();
 

From 7330cf642082c94d19fc5eaa7a82ae0ef6fcec1b Mon Sep 17 00:00:00 2001
From: John Saigle <john.saigle@gmail.com>
Date: Mon, 5 Nov 2018 15:46:53 -0500
Subject: [PATCH 8/9] Fix calls to Utility in stats module

---
 .../php/stats_behavioural.class.inc           | 30 ++++++++++---------
 .../php/stats_demographic.class.inc           | 22 +++++++-------
 php/libraries/Utility.class.inc               |  7 +++--
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/modules/statistics/php/stats_behavioural.class.inc b/modules/statistics/php/stats_behavioural.class.inc
index fdf5ffe8820..aa25c00a4b4 100644
--- a/modules/statistics/php/stats_behavioural.class.inc
+++ b/modules/statistics/php/stats_behavioural.class.inc
@@ -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(
diff --git a/modules/statistics/php/stats_demographic.class.inc b/modules/statistics/php/stats_demographic.class.inc
index 8359204e449..728286d77fe 100644
--- a/modules/statistics/php/stats_demographic.class.inc
+++ b/modules/statistics/php/stats_demographic.class.inc
@@ -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
diff --git a/php/libraries/Utility.class.inc b/php/libraries/Utility.class.inc
index 973de0c13d7..4950b5acdcb 100644
--- a/php/libraries/Utility.class.inc
+++ b/php/libraries/Utility.class.inc
@@ -249,13 +249,16 @@ class Utility
     /**
      * Returns a list of study Subprojects associated with a project
      *
-     * @param integer $projectID The project for which you would like
+     * @param integer|null $projectID The project for which you would like
      *                           to get the subprojects
      *
      * @return array an associative array("SubprojectID" => "Subproject title")
      */
-    static function getSubprojectsForProject(int $projectID): array
+    static function getSubprojectsForProject(?int $projectID): array
     {
+        if (is_null($projectID)) {
+            return array();
+        }
         return self::getSubprojectList($projectID);
     }
 

From 83472ab7771870b8f0b651a5f3c682d4bf5a338c Mon Sep 17 00:00:00 2001
From: John Saigle <john.saigle@gmail.com>
Date: Mon, 12 Nov 2018 11:59:58 -0500
Subject: [PATCH 9/9] Melanie's feedback

---
 php/libraries/Utility.class.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/php/libraries/Utility.class.inc b/php/libraries/Utility.class.inc
index 4950b5acdcb..4b971068fb1 100644
--- a/php/libraries/Utility.class.inc
+++ b/php/libraries/Utility.class.inc
@@ -224,7 +224,7 @@ class Utility
      *
      * @return array       an associative array("SubprojectID" => "Subproject title")
      */
-    static function getSubprojectList(int $projectID = null): array
+    static function getSubprojectList(?int $projectID = null): array
     {
         $factory = NDB_Factory::singleton();
         $DB      = $factory->database();
@@ -254,7 +254,7 @@ class Utility
      *
      * @return array an associative array("SubprojectID" => "Subproject title")
      */
-    static function getSubprojectsForProject(?int $projectID): array
+    static function getSubprojectsForProject(?int $projectID = null): array
     {
         if (is_null($projectID)) {
             return array();