[Core] Add ProjectID Singleton

modules/api/php/models/candidatesrow.class.inc

@@ -43,7 +43,7 @@ class CandidatesRow implements \LORIS\Data\DataInstance,
         $this->_candid      = $row['CandID'] ?? null;
         $this->_projectname = $row['ProjectName'] ?? null;
         if ($row['ProjectID'] !== null) {
-            $this->_projectid = new \ProjectID($row['ProjectID']);
+            $this->_projectid = \ProjectID::singleton(intval($row['ProjectID']));
         }
         $this->_pscid    = $row['PSCID'] ?? null;
         $this->_sitename = $row['SiteName'] ?? null;

modules/behavioural_qc/php/models/behaviouraldto.class.inc

@@ -51,9 +51,9 @@ class BehaviouralDTO implements \LORIS\Data\DataInstance,
     /**
      * The project
      *
-     * @var string
+     * @var int
      */
-    private $_project = '';
+    private $_project;
 
     /**
      * The feedback_status
@@ -137,7 +137,7 @@ class BehaviouralDTO implements \LORIS\Data\DataInstance,
      */
     public function getProjectID(): \ProjectID
     {
-        return new \ProjectID(strval($this->_project));
+        return \ProjectID::singleton($this->_project);
     }
 
     /**

modules/behavioural_qc/php/models/conflictsdto.class.inc

@@ -51,9 +51,9 @@ class ConflictsDTO implements \LORIS\Data\DataInstance,
     /**
      * The project
      *
-     * @var string
+     * @var int
      */
-    private $_project = '';
+    private $_project;
 
     /**
      * The feedback_status
@@ -123,7 +123,7 @@ class ConflictsDTO implements \LORIS\Data\DataInstance,
      */
     public function getProjectID(): \ProjectID
     {
-        return new \ProjectID(strval($this->_project));
+        return \ProjectID::singleton($this->_project);
     }
 
     /**

modules/behavioural_qc/php/models/incompletedto.class.inc

@@ -51,9 +51,9 @@ class IncompleteDTO implements \LORIS\Data\DataInstance,
     /**
      * The project
      *
-     * @var string
+     * @var int
      */
-    private $_project = '';
+    private $_project;
 
     /**
      * The feedback_status
@@ -123,7 +123,7 @@ class IncompleteDTO implements \LORIS\Data\DataInstance,
      */
     public function getProjectID(): \ProjectID
     {
-        return new \ProjectID(strval($this->_project));
+        return \ProjectID::singleton($this->_project);
     }
 
     /**

modules/candidate_list/php/candidatelistrowprovisioner.class.inc

@@ -100,7 +100,7 @@ class CandidateListRowProvisioner extends \LORIS\Data\Provisioners\DBRowProvisio
         // behaviour of requiring the registration site to match
         // one of the user's sites.
         $cid = \CenterID::singleton(intval($row['RegistrationCenterID']));
-        $pid = new \ProjectID($row['RegistrationProjectID']);
+        $pid = \ProjectID::singleton(intval($row['RegistrationProjectID']));
         if ($row['DoB'] !== null) {
             $dob = new \DateTimeImmutable($row['DoB']);
             switch ($this->dobFormat) {

modules/candidate_parameters/ajax/getData.php

@@ -645,11 +645,11 @@ function getDiagnosisEvolutionFields(): array
     foreach ($candProjIDs as $projectID) {
         $candProjects[$projectID]   = $projectList[$projectID];
         $latestDiagnosis[]          = $candidate->getLatestDiagnosis(
-            new \ProjectID($projectID),
+            \ProjectID::singleton(intval($projectID)),
             false
         );
         $latestConfirmedDiagnosis[] = $candidate->getLatestDiagnosis(
-            new \ProjectID($projectID),
+            \ProjectID::singleton(intval($projectID)),
             true
         );
     }

modules/configuration/ajax/updateProject.php

@@ -69,7 +69,7 @@
     }
 
     // Update Project fields
-    $project = \Project::getProjectFromID(new \ProjectID($projectID));
+    $project = \Project::getProjectFromID(\ProjectID::singleton(intval($projectID)));
     $project->updateName($projectName);
     $project->updateAlias($projectAlias);
     $project->updateRecruitmentTarget($recTarget);

modules/configuration/php/project.class.inc

@@ -57,7 +57,7 @@ class Project extends \NDB_Form
             $projects[$ProjectID] = $config->getProjectSettings($ProjectID);
             $projects[$ProjectID]['projectCohorts']
                 = \Utility::getCohortsForProject(
-                    new \ProjectID(strval($ProjectID))
+                    \ProjectID::singleton($ProjectID)
                 );
         }
         $this->tpl_data['projects'] = $projects;

modules/conflict_resolver/php/models/resolveddto.class.inc

@@ -98,6 +98,6 @@ class ResolvedDTO implements DataInstance, SiteHaver
      */
     public function getProjectID(): \ProjectID
     {
-        return new \ProjectID(strval($this->projectid));
+        return \ProjectID::singleton($this->projectid);
     }
 }

modules/conflict_resolver/php/models/unresolveddto.class.inc

@@ -88,6 +88,6 @@ class UnresolvedDTO implements DataInstance, SiteHaver
      */
     public function getProjectID(): \ProjectID
     {
-        return new \ProjectID(strval($this->projectid));
+        return \ProjectID::singleton($this->projectid);
     }
 }

modules/create_timepoint/php/timepoint.class.inc

@@ -82,7 +82,7 @@ class Timepoint extends \NDB_Page implements ETagCalculator
         $cohortGroups = [];
         foreach ($projectOptions as $pid=>$pname) {
             $cohortGroups[$pid] = \Utility::getCohortList(
-                new \ProjectID(strval($pid))
+                \ProjectID::singleton($pid)
             );
         }
         $values['cohortGroups'] = $cohortGroups;
@@ -92,7 +92,7 @@ class Timepoint extends \NDB_Page implements ETagCalculator
         foreach ($cohortGroups as $pid=>$cohortList) {
             foreach ($cohortList as $sid=>$title) {
                 $visitGroups[$pid][$sid] = \Utility::getVisitsForProjectCohort(
-                    new \ProjectID(strval($pid)),
+                    \ProjectID::singleton($pid),
                     $sid
                 );
             }
@@ -161,7 +161,7 @@ class Timepoint extends \NDB_Page implements ETagCalculator
             // if there is only one project, autoselect first project from array of 1
             $project = \Project::getProjectFromID(array_pop($user_list_of_projects));
         } else if (count($user_list_of_projects) > 1) {
-            $project_id = new \ProjectID($values['project']);
+            $project_id = \ProjectID::singleton($values['project']);
             $project    = \Project::getProjectFromID($project_id);
         }
 
@@ -261,7 +261,7 @@ class Timepoint extends \NDB_Page implements ETagCalculator
 
         $candid    = $values['candID'];
         $cohortID  = intval($values['cohort']);
-        $projectID = new \ProjectID($values['project']);
+        $projectID = \ProjectID::singleton($values['project']);
 
         //Visit - Get all visits to map ID back to label for session table
         $visits     = \Utility::getVisitsForProjectCohort(

modules/dataquery/php/query.class.inc

@@ -612,7 +612,7 @@ class Query implements \LORIS\StudyEntities\AccessibleResource,
                 $organized[$candid]['Timepoints'][] = new \TimePoint(
                     new \TimePointData(
                         new \SessionID($row['sessionID']),
-                        new \ProjectID($row['SProjectID']),
+                        \ProjectID::singleton($row['SProjectID']),
                         \CenterID::singleton($row['SCenterID']),
                     )
                 );
@@ -623,7 +623,9 @@ class Query implements \LORIS\StudyEntities\AccessibleResource,
         foreach ($organized as $vals) {
             $canddata  = new \CandidateData(
                 candID: $vals['CandID'],
-                registrationProjectID: new \ProjectID($vals['RegistrationProject']),
+                registrationProjectID: \ProjectID::singleton(
+                    $vals['RegistrationProject']
+                ),
                 registrationCenterID: \CenterID::singleton(
                     $vals['RegistrationCenter']
                 ),

modules/electrophysiology_browser/php/electrophysiologybrowserrowprovisioner.class.inc

@@ -83,7 +83,7 @@ class ElectrophysiologyBrowserRowProvisioner
     public function getInstance($row) : \LORIS\Data\DataInstance
     {
         $cid = \CenterID::singleton(intval($row['CenterID']));
-        $pid = new \ProjectID($row['ProjectID']);
+        $pid = \ProjectID::singleton(intval($row['ProjectID']));
         unset($row['CenterID']);
         unset($row['ProjectID']);
         return new ElectrophysiologyBrowserRow($row, $cid, $pid);

modules/electrophysiology_uploader/php/electrophysiologyuploaderprovisioner.class.inc

@@ -58,7 +58,7 @@ class ElectrophysiologyUploaderProvisioner
     public function getInstance($row): DataInstance
     {
         $cid = \CenterID::singleton($row['RegistrationCenterID']);
-        $pid = new \ProjectID($row['RegistrationProjectID']);
+        $pid = \ProjectID::singleton($row['RegistrationProjectID']);
         unset($row['RegistrationCenterID']);
         unset($row['RegistrationProjectID']);
         return new ElectrophysiologyUploaderRow($row, $cid, $pid);

modules/genomic_browser/php/models/cnvdto.class.inc

@@ -33,9 +33,9 @@ class CnvDTO implements DataInstance, SiteHaver
     /**
      * The projectID
      *
-     * @var string
+     * @var int
      */
-    private $_projectID = "";
+    private $_projectID;
 
     /**
      * The PSC
@@ -265,6 +265,6 @@ class CnvDTO implements DataInstance, SiteHaver
      */
     public function getProjectID(): \ProjectID
     {
-        return new \ProjectID(strval($this->_projectID));
+        return \ProjectID::singleton($this->_projectID);
     }
 }

modules/genomic_browser/php/models/methylationdto.class.inc

@@ -33,9 +33,9 @@ class MethylationDTO implements DataInstance, SiteHaver
     /**
      * The projectID
      *
-     * @var string
+     * @var int
      */
-    private $_projectID = "";
+    private $_projectID;
 
     /**
      * The PSC
@@ -329,6 +329,6 @@ class MethylationDTO implements DataInstance, SiteHaver
      */
     public function getProjectID(): \ProjectID
     {
-        return new \ProjectID(strval($this->_projectID));
+        return \ProjectID::singleton($this->_projectID);
     }
 }

modules/genomic_browser/php/models/profiledto.class.inc

@@ -43,9 +43,9 @@ class ProfileDTO implements DataInstance, SiteHaver
     /**
      * The projectID
      *
-     * @var string
+     * @var int
      */
-    private $_projectID = "";
+    private $_projectID;
 
     /**
      * The PSC name
@@ -163,6 +163,6 @@ class ProfileDTO implements DataInstance, SiteHaver
      */
     public function getProjectID(): \ProjectID
     {
-        return new \ProjectID(strval($this->_projectID));
+        return \ProjectID::singleton($this->_projectID);
     }
 }

modules/genomic_browser/php/models/snpdto.class.inc

@@ -42,9 +42,9 @@ class SnpDTO implements DataInstance, SiteHaver
     /**
      * The projectID
      *
-     * @var string
+     * @var int
      */
-    private $_projectID = "";
+    private $_projectID;
 
     /**
      * The PSC
@@ -314,6 +314,6 @@ class SnpDTO implements DataInstance, SiteHaver
      */
     public function getProjectID(): \ProjectID
     {
-        return new \ProjectID(strval($this->_projectID));
+        return \ProjectID::singleton($this->_projectID);
     }
 }

modules/mri_violations/php/mriviolation.class.inc

@@ -56,6 +56,6 @@ class MRIViolation implements \LORIS\Data\DataInstance
         if ($this->DBRow['Project'] === null) {
             return null;
         }
-        return new \ProjectID($this->DBRow['Project']);
+        return \ProjectID::singleton($this->DBRow['Project']);
     }
 }

modules/mri_violations/php/userprojectmatchornull.class.inc

@@ -51,9 +51,7 @@ class UserProjectMatchOrNull implements \LORIS\Data\Filter
         if (method_exists($res, 'getProjectID')) {
             $resourceProject = $res->getProjectID();
             if (!is_null($resourceProject)) {
-                return $user->hasProject(
-                    new \ProjectID(strval($resourceProject))
-                );
+                return $user->hasProject($resourceProject);
             }
             return true;
         }

modules/schedule_module/php/schedulemoduleprovisioner.class.inc

@@ -120,7 +120,7 @@ ON
         // behaviour of requiring the registration site to match
         // one of the user's sites.
         $cid = \CenterID::singleton(intval($row['RegistrationCenterID']));
-        $pid = new \ProjectID($row['RegistrationProjectID']);
+        $pid = \ProjectID::singleton(intval($row['RegistrationProjectID']));
         unset($row['RegistrationCenterID']);
         unset($row['RegistrationProjectID']);
         return new ScheduleRow($row, $cid, $pid);

modules/statistics/php/statistics_mri_site.class.inc

@@ -214,7 +214,7 @@ class Statistics_Mri_Site extends Statistics_Site
         // template
         $visits    = [];
         $projectID = isset($_REQUEST['ProjectID'])
-            ? new \ProjectID($_REQUEST['ProjectID'])
+            ? \ProjectID::singleton(intval($_REQUEST['ProjectID']))
             : null;
 
         $data = [];

modules/statistics/php/statistics_site.class.inc

@@ -94,13 +94,12 @@ class Statistics_Site extends \NDB_Menu
      *
      * @return void
      */
-    function _checkCriteria($centerID, $projectID)
+    function _checkCriteria(\CenterID $centerID, \ProjectID $projectID)
     {
 
         //SITES
-        $projectID = new \ProjectID(strval($projectID));
-        $factory   = \NDB_Factory::singleton();
-        $user      = $factory->user();
+        $factory = \NDB_Factory::singleton();
+        $user    = $factory->user();
 
         if (!empty($centerID) && $user->hasCenter($centerID)) {
             $this->query_criteria   .= " AND s.CenterID =:cid ";

modules/statistics/php/stats_behavioural.class.inc

@@ -121,7 +121,9 @@ class Stats_Behavioural extends \NDB_Form
         }
 
         if ($_REQUEST['BehaviouralProject'] ?? '') {
-            $currentProject = new \ProjectID($_REQUEST['BehaviouralProject']);
+            $currentProject = \ProjectID::singleton(
+                intval($_REQUEST['BehaviouralProject'])
+            );
             $this->tpl_data['CurrentProject']
                 = [
                     'ID'   => $currentProject,