diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 03e052c7d3..0e5fb1832e 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -13,15 +13,14 @@
     ->exclude('resources')
     ->exclude('public')
     ->exclude('app/cdash/tests/kwtest/simpletest')
-    ->notPath('app/cdash/tests/config.test.local.php')
     ->in(__DIR__);
 
 $config = new Config();
 return $config->setRules([
     '@PSR12' => true,
     '@PSR12:risky' => true,
-    '@PHP82Migration' => true,
-    '@PHP82Migration:risky' => true,
+    '@PHP8x2Migration' => true,
+    '@PHP8x2Migration:risky' => true,
     '@Symfony' => true,
     'yoda_style' => false,
     'blank_line_before_statement' => false,
@@ -32,4 +31,25 @@
     'global_namespace_import' => ['import_classes' => true, 'import_constants' => null, 'import_functions' => null],
     'phpdoc_align' => ['align' => 'left'],
     'declare_strict_types' => false, // TODO: turn this back on.  Currently causes errors...
+    // The following rules are a subset of @Symfony:risky and should eventually be replaced by the full ruleset.
+    'array_push' => true,
+    'combine_nested_dirname' => true,
+    'dir_constant' => true,
+    'ereg_to_preg' => true,
+    'fopen_flag_order' => true,
+    'function_to_constant' => true,
+    'get_class_to_class_keyword' => true,
+    'implode_call' => true,
+    'is_null' => true,
+    'logical_operators' => true,
+    'long_to_shorthand_operator' => true,
+    'modernize_strpos' => ['modernize_stripos' => true],
+    'modernize_types_casting' => true,
+    'no_homoglyph_names' => true,
+    'no_useless_sprintf' => true,
+    'non_printable_character' => true,
+    'ordered_traits' => true,
+    'self_accessor' => true,
+    'set_type_to_cast' => true,
+    'string_line_ending' => true,
 ])->setFinder($finder);
diff --git a/app/Console/Commands/RemoveUser.php b/app/Console/Commands/RemoveUser.php
index b8ef8d3f79..168dadb7f4 100644
--- a/app/Console/Commands/RemoveUser.php
+++ b/app/Console/Commands/RemoveUser.php
@@ -37,7 +37,7 @@ public function __construct()
     public function handle(): void
     {
         $email = $this->option('email');
-        if (is_null($email)) {
+        if (null === $email) {
             $this->error('You must specify the --email option');
             return;
         }
diff --git a/app/Console/Commands/SaveUser.php b/app/Console/Commands/SaveUser.php
index 0520f3c736..dd03bf4030 100644
--- a/app/Console/Commands/SaveUser.php
+++ b/app/Console/Commands/SaveUser.php
@@ -37,7 +37,7 @@ public function __construct()
     public function handle(): void
     {
         $email = $this->option('email');
-        if (is_null($email)) {
+        if (null === $email) {
             $this->error('You must specify the --email option');
             return;
         }
@@ -57,7 +57,7 @@ public function handle(): void
         $options = ['firstname', 'lastname', 'institution', 'password'];
         foreach ($options as $option_name) {
             $option_value = $this->option($option_name);
-            if (!is_null($option_value)) {
+            if (null !== $option_value) {
                 if ($option_name === 'password') {
                     $option_value = password_hash($option_value, PASSWORD_DEFAULT);
                 }
diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index d8e7246a22..c644c76023 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -14,12 +14,12 @@ public function removeBuilds(): View|RedirectResponse
     {
         @set_time_limit(0);
 
-        $projectid = intval($_GET['projectid'] ?? 0);
+        $projectid = (int) ($_GET['projectid'] ?? 0);
 
         $alert = '';
 
         // get date info here
-        @$dayTo = intval($_POST['dayFrom']);
+        @$dayTo = (int) $_POST['dayFrom'];
         if (empty($dayTo)) {
             $time = strtotime('2000-01-01 00:00:00');
 
@@ -43,12 +43,12 @@ public function removeBuilds(): View|RedirectResponse
             $yearTo = date('Y');
             $monthTo = date('m');
         } else {
-            $dayFrom = intval($_POST['dayFrom']);
-            $monthFrom = intval($_POST['monthFrom']);
-            $yearFrom = intval($_POST['yearFrom']);
-            $dayTo = intval($_POST['dayTo']);
-            $monthTo = intval($_POST['monthTo']);
-            $yearTo = intval($_POST['yearTo']);
+            $dayFrom = (int) $_POST['dayFrom'];
+            $monthFrom = (int) $_POST['monthFrom'];
+            $yearFrom = (int) $_POST['yearFrom'];
+            $dayTo = (int) $_POST['dayTo'];
+            $monthTo = (int) $_POST['monthTo'];
+            $yearTo = (int) $_POST['yearTo'];
         }
 
         // List the available projects
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 524c27c18a..0c8edd3620 100755
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -89,7 +89,7 @@ protected function validator(array $data)
      */
     public function create(array $data): ?User
     {
-        if (is_null($data['institution'])) {
+        if (null === $data['institution']) {
             $data['institution'] = '';
         }
         return User::create([
diff --git a/app/Http/Controllers/AuthTokenController.php b/app/Http/Controllers/AuthTokenController.php
index f359074773..6b3e99108d 100644
--- a/app/Http/Controllers/AuthTokenController.php
+++ b/app/Http/Controllers/AuthTokenController.php
@@ -47,7 +47,7 @@ public function createToken(Request $request): JsonResponse
         }
 
         if ($request->input('scope') !== AuthToken::SCOPE_FULL_ACCESS) {
-            $projectid = intval($request->input('projectid'));
+            $projectid = (int) $request->input('projectid');
             if (!is_numeric($projectid)) {
                 return response()->json(['error' => 'Invalid projectid'], Response::HTTP_BAD_REQUEST);
             }
diff --git a/app/Http/Controllers/BuildController.php b/app/Http/Controllers/BuildController.php
index cbaaf3366c..b6985431e7 100644
--- a/app/Http/Controllers/BuildController.php
+++ b/app/Http/Controllers/BuildController.php
@@ -114,7 +114,7 @@ public function apiBuildSummary(): JsonResponse
     {
         $pageTimer = new PageTimer();
 
-        $this->setBuildById(intval($_GET['buildid'] ?? -1));
+        $this->setBuildById((int) ($_GET['buildid'] ?? -1));
 
         $date = TestingDay::get($this->project, $this->build->StartTime);
 
@@ -504,7 +504,7 @@ public function buildOverview(): View|RedirectResponse
         $currentstarttime = get_dates($date, $this->project->NightlyTime)[1];
 
         // Return the available groups
-        $selected_group = intval($_POST['groupSelection'] ?? 0);
+        $selected_group = (int) ($_POST['groupSelection'] ?? 0);
 
         // Check the builds
         $beginning_timestamp = $currentstarttime;
@@ -580,7 +580,7 @@ public function viewUpdatePageContent(): JsonResponse
     {
         $pageTimer = new PageTimer();
 
-        $this->setBuildById(intval($_GET['buildid'] ?? -1));
+        $this->setBuildById((int) ($_GET['buildid'] ?? -1));
 
         $date = TestingDay::get($this->project, $this->build->StartTime);
         $response = begin_JSON_response();
@@ -821,13 +821,13 @@ public function build_file(int $build_id, int $file_id): StreamedResponse
 
     public function ajaxBuildNote(): View
     {
-        $this->setBuildById(intval($_GET['buildid'] ?? -1));
+        $this->setBuildById((int) ($_GET['buildid'] ?? -1));
         Gate::authorize('edit-project', $this->project);
 
         $notes = DB::select('SELECT * FROM comments WHERE buildid=? ORDER BY timestamp ASC', [$this->build->Id]);
         foreach ($notes as $note) {
             /** @var User $user */
-            $user = User::where('id', intval($note->userid))->first();
+            $user = User::where('id', (int) $note->userid)->first();
             $note->user = $user;
         }
 
@@ -851,7 +851,7 @@ public function apiViewBuildError(): JsonResponse
         $response = begin_JSON_response();
         $response['title'] = $this->project->Name;
 
-        $type = intval($_GET['type'] ?? 0);
+        $type = (int) ($_GET['type'] ?? 0);
 
         $date = TestingDay::get($this->project, $this->build->StartTime);
         get_dashboard_JSON($this->project->Name, $date, $response);
@@ -928,7 +928,7 @@ public function apiViewBuildError(): JsonResponse
                             label.id=label2buildfailure.labelid
                             AND label2buildfailure.buildfailureid=?
                         ORDER BY text ASC
-                    ', [intval($resolvedBuildFailure['id'])], $marshaledResolvedBuildFailure);
+                    ', [(int) $resolvedBuildFailure['id']], $marshaledResolvedBuildFailure);
                 }
 
                 $marshaledResolvedBuildFailure = array_merge($marshaledResolvedBuildFailure, [
@@ -1077,7 +1077,7 @@ public function apiViewConfigure(): JsonResponse
 
     public function apiBuildUpdateGraph(): JsonResponse
     {
-        $this->setBuildById(intval($_GET['buildid'] ?? -1));
+        $this->setBuildById((int) ($_GET['buildid'] ?? -1));
 
         // Find previous submissions from this build.
         $query_result = DB::select('
@@ -1118,7 +1118,7 @@ public function apiBuildUpdateGraph(): JsonResponse
 
     public function apiGetPreviousBuilds(): JsonResponse
     {
-        $this->setBuildById(intval($_GET['buildid'] ?? -1));
+        $this->setBuildById((int) ($_GET['buildid'] ?? -1));
 
         // Take subproject into account, such that if there is one, then the
         // previous builds must be associated with the same subproject.
@@ -1190,7 +1190,7 @@ public function apiGetPreviousBuilds(): JsonResponse
      */
     public function apiBuildExpected(): JsonResponse
     {
-        $this->setBuildById(intval($_GET['buildid'] ?? -1));
+        $this->setBuildById((int) ($_GET['buildid'] ?? -1));
         $rule = new BuildGroupRule($this->build);
         return response()->json([
             'expected' => $rule->GetExpected(),
@@ -1372,7 +1372,7 @@ private function restApiGet(): JsonResponse
                     $gmtdate = strtotime($last_good_submit . ' UTC');
                 } else {
                     // Find the oldest submission for this build.
-                    if (is_null($first_submit)) {
+                    if (null === $first_submit) {
                         pdo_execute($oldest_build_stmt, $query_params);
                         $first_submit = $oldest_build_stmt->fetchColumn();
                     }
diff --git a/app/Http/Controllers/BuildNoteController.php b/app/Http/Controllers/BuildNoteController.php
index 9017744d2a..7a55b72834 100644
--- a/app/Http/Controllers/BuildNoteController.php
+++ b/app/Http/Controllers/BuildNoteController.php
@@ -16,7 +16,7 @@ final class BuildNoteController extends AbstractBuildController
 {
     public function apiViewNotes(): JsonResponse
     {
-        $this->setBuildById(intval($_GET['buildid'] ?? 0));
+        $this->setBuildById((int) ($_GET['buildid'] ?? 0));
 
         $pageTimer = new PageTimer();
 
diff --git a/app/Http/Controllers/BuildPropertiesController.php b/app/Http/Controllers/BuildPropertiesController.php
index 47db6d24e9..a0a869e833 100644
--- a/app/Http/Controllers/BuildPropertiesController.php
+++ b/app/Http/Controllers/BuildPropertiesController.php
@@ -54,7 +54,7 @@ public function apiBuildProperties(): JsonResponse
             // Default to the current date.
             $date = date(FMT_DATE);
         }
-        if (is_null($beginning_timestamp)) {
+        if (null === $beginning_timestamp) {
             [$unused, $beginning_timestamp] = get_dates($date, $this->project->NightlyTime);
             $datetime = new DateTime();
             $datetime->setTimestamp($beginning_timestamp);
@@ -256,7 +256,7 @@ private function get_defects_for_builds()
             $stmt = $pdo->prepare($sql);
             $stmt->execute($_GET['buildid']);
 
-            if (!$this->gather_defects($stmt, $prettyname, $defects_response) && !is_null($sql2)) {
+            if (!$this->gather_defects($stmt, $prettyname, $defects_response) && null !== $sql2) {
                 $stmt = $pdo->prepare($sql2);
                 $stmt->execute($_GET['buildid']);
                 $this->gather_defects($stmt, $prettyname, $defects_response);
diff --git a/app/Http/Controllers/CDash.php b/app/Http/Controllers/CDash.php
index 1790693c58..14e8296318 100755
--- a/app/Http/Controllers/CDash.php
+++ b/app/Http/Controllers/CDash.php
@@ -102,7 +102,7 @@ protected function getRequestContents()
         // Possible values of $redirect are null, 0, 1 and a ResponseRedirect.
         // Clearly we want to ignore when null or int, otherwise $redirect should
         // be returned
-        return is_numeric($redirect) || is_null($redirect) ? $content : $redirect;
+        return is_numeric($redirect) || null === $redirect ? $content : $redirect;
     }
 
     /**
diff --git a/app/Http/Controllers/CoverageController.php b/app/Http/Controllers/CoverageController.php
index 293e9cfd4b..40ece91fe6 100644
--- a/app/Http/Controllers/CoverageController.php
+++ b/app/Http/Controllers/CoverageController.php
@@ -31,7 +31,7 @@ public function viewCoverage(): View|RedirectResponse
     {
         @set_time_limit(0);
 
-        $this->setBuildById(intval($_GET['buildid'] ?? -1));
+        $this->setBuildById((int) ($_GET['buildid'] ?? -1));
 
         @$date = $_GET['date'];
         if ($date != null) {
@@ -56,7 +56,7 @@ public function viewCoverage(): View|RedirectResponse
                             SELECT role
                             FROM user2project
                             WHERE userid=? AND projectid=?
-                        ', [intval($userid), intval($this->project->Id)]);
+                        ', [(int) $userid, (int) $this->project->Id]);
         if (!empty($user2project)) {
             $role = $user2project['role'];
         }
@@ -75,9 +75,9 @@ public function viewCoverage(): View|RedirectResponse
                        SELECT coveragethreshold
                        FROM subprojectgroup
                        WHERE projectid=? AND id=?
-                   ', [intval($this->project->Id), intval($this->build->GroupId)]);
+                   ', [(int) $this->project->Id, (int) $this->build->GroupId]);
             if (!empty($row) && isset($row['coveragethreshold'])) {
-                $threshold = intval($row['coveragethreshold']);
+                $threshold = (int) $row['coveragethreshold'];
             }
         }
 
@@ -97,7 +97,7 @@ public function viewCoverage(): View|RedirectResponse
                               FROM coverage
                               WHERE buildid=?
                               GROUP BY buildid
-                          ', [intval($this->build->Id)]);
+                          ', [(int) $this->build->Id]);
 
         $xml .= add_XML_value('starttime', date('l, F d Y', strtotime($this->build->StartTime)));
         $xml .= add_XML_value('loctested', $coverage_array['loctested']);
@@ -133,7 +133,7 @@ public function viewCoverage(): View|RedirectResponse
                                  label.id=label2coverage.labelid
                                  AND label2coverage.coverageid=coverage.id
                                  AND coverage.buildid=?
-                         ', [intval($this->build->Id)]);
+                         ', [(int) $this->build->Id]);
             foreach ($covlabels as $row) {
                 $labels[$row['id']] = $row['text'];
             }
@@ -154,10 +154,10 @@ public function viewCoverage(): View|RedirectResponse
                                    label2coverage.labelid=?
                                    AND coverage.buildid=?
                                    AND coverage.id=label2coverage.coverageid
-                           ', [intval($id), intval($this->build->Id)]);
+                           ', [(int) $id, (int) $this->build->Id]);
 
-                    $loctested = intval($row['loctested']);
-                    $locuntested = intval($row['locuntested']);
+                    $loctested = (int) $row['loctested'];
+                    $locuntested = (int) $row['locuntested'];
                     $percentcoverage = compute_percentcoverage($loctested, $locuntested);
 
                     $xml .= '<label>';
@@ -174,15 +174,15 @@ public function viewCoverage(): View|RedirectResponse
                             SELECT count(covered) AS c
                             FROM coverage
                             WHERE buildid=? AND covered='1'
-                        ", [intval($this->build->Id)]);
-        $ncoveredfiles = intval($coveredfiles['c']);
+                        ", [(int) $this->build->Id]);
+        $ncoveredfiles = (int) $coveredfiles['c'];
 
         $files = $db->executePreparedSingleRow('
                      SELECT count(covered) AS c
                      FROM coverage
                      WHERE buildid=?
-                 ', [intval($this->build->Id)]);
-        $nfiles = intval($files['c']);
+                 ', [(int) $this->build->Id]);
+        $nfiles = (int) $files['c'];
 
         $xml .= add_XML_value('totalcovered', $ncoveredfiles);
         $xml .= add_XML_value('totalfiles', $nfiles);
@@ -212,7 +212,7 @@ public function viewCoverage(): View|RedirectResponse
                                 c.buildid=?
                                 AND c.covered=1
                                 AND c.fileid=cf.id
-                        ', [intval($this->build->Id)]);
+                        ', [(int) $this->build->Id]);
 
         $directories = [];
         $covfile_array = [];
@@ -289,7 +289,7 @@ public function viewCoverage(): View|RedirectResponse
                     WHERE
                         c.buildid=?
                         AND c.covered=0
-                ', [intval($this->build->Id)]);
+                ', [(int) $this->build->Id]);
         foreach ($coveragefile as $coveragefile_array) {
             // TODO: (williamjallen) This loop doesn't really make sense...
             $covfile['covered'] = 0;
@@ -357,9 +357,9 @@ public function ajaxGetViewCoverage(): JsonResponse
     {
         @set_time_limit(0);
 
-        $this->setBuildById(intval($_GET['buildid'] ?? -1));
+        $this->setBuildById((int) ($_GET['buildid'] ?? -1));
 
-        $userid = intval($_GET['userid'] ?? 0);
+        $userid = (int) ($_GET['userid'] ?? 0);
 
         $db = Database::getInstance();
 
@@ -394,15 +394,15 @@ public function ajaxGetViewCoverage(): JsonResponse
                                  GROUP BY buildid
                              ', [$this->build->Id]);
         if (!empty($coverage_branches)) {
-            $total_branchesuntested = intval($coverage_branches['total_branchesuntested']);
-            $total_branchestested = intval($coverage_branches['total_branchestested']);
+            $total_branchesuntested = (int) $coverage_branches['total_branchesuntested'];
+            $total_branchestested = (int) $coverage_branches['total_branchestested'];
         }
 
         /* Sorting */
         $sortby = 'filename';
         if (isset($_GET['iSortCol_0'])) {
             if (($total_branchesuntested + $total_branchestested) > 0) {
-                switch (intval($_GET['iSortCol_0'])) {
+                switch ((int) $_GET['iSortCol_0']) {
                     case 0:
                         $sortby = 'filename';
                         break;
@@ -423,7 +423,7 @@ public function ajaxGetViewCoverage(): JsonResponse
                         break;
                 }
             } else {
-                switch (intval($_GET['iSortCol_0'])) {
+                switch ((int) $_GET['iSortCol_0']) {
                     case 0:
                         $sortby = 'filename';
                         break;
@@ -655,7 +655,7 @@ public function ajaxGetViewCoverage(): JsonResponse
 
         // Array to return to the datatable
         $output = [
-            'sEcho' => intval($_GET['sEcho']),
+            'sEcho' => (int) $_GET['sEcho'],
             'aaData' => [],
         ];
 
@@ -1065,7 +1065,7 @@ public function ajaxGetViewCoverage(): JsonResponse
                                           AND coverage.fileid=?
                                           AND coverage.buildid=?
                                       ORDER BY text ASC
-                                  ', [intval($fileid), $this->build->Id]);
+                                  ', [(int) $fileid, $this->build->Id]);
                 foreach ($coveragelabels as $coveragelabels_array) {
                     if ($labels != '') {
                         $labels .= ', ';
@@ -1440,7 +1440,7 @@ private static function apiCompareCoverage_populate_subproject(array $subproject
     private static function apiCompareCoverage_get_build_label(int $buildid, array $build_array): string
     {
         // Figure out how many labels to report for this build.
-        if (!array_key_exists('numlabels', $build_array) || intval($build_array['numlabels']) === 0) {
+        if (!array_key_exists('numlabels', $build_array) || (int) $build_array['numlabels'] === 0) {
             $num_labels = 0;
         } else {
             $num_labels = $build_array['numlabels'];
@@ -1458,7 +1458,7 @@ private static function apiCompareCoverage_get_build_label(int $buildid, array $
                                 INNER JOIN label2build AS l2b ON (l.id=l2b.labelid)
                                 INNER JOIN build AS b ON (l2b.buildid=b.id)
                                 WHERE b.id=?
-                            ', [intval($buildid)]);
+                            ', [(int) $buildid]);
             $build_label = $label_result['text'];
         } else {
             // More than one label, just report the number.
@@ -1528,7 +1528,7 @@ private static function apiCompareCoverage_get_coverage(array $build_data, array
             $coverage_response['loctested'] = (int) $build_array['loctested'];
 
             // Compute the diff
-            if (!is_null($build_array['loctesteddiff']) || !is_null($build_array['locuntesteddiff'])) {
+            if (null !== $build_array['loctesteddiff'] || null !== $build_array['locuntesteddiff']) {
                 $loctesteddiff = (int) $build_array['loctesteddiff'];
                 $locuntesteddiff = (int) $build_array['locuntesteddiff'];
                 $previouspercent =
diff --git a/app/Http/Controllers/DynamicAnalysisController.php b/app/Http/Controllers/DynamicAnalysisController.php
index abbc7504db..5743fc3306 100644
--- a/app/Http/Controllers/DynamicAnalysisController.php
+++ b/app/Http/Controllers/DynamicAnalysisController.php
@@ -136,7 +136,7 @@ public function apiViewDynamicAnalysis(): JsonResponse
                                 label.id = label2dynamicanalysis.labelid
                                 AND label2dynamicanalysis.dynamicanalysisid = ?
                             ORDER BY text ASC
-                        ', [intval($dynid)], $dynamic_analysis);
+                        ', [(int) $dynid], $dynamic_analysis);
 
                         if (array_key_exists('labels', $dynamic_analysis)) {
                             $dynamic_analysis['labels'] = implode(', ', $dynamic_analysis['labels']);
diff --git a/app/Http/Controllers/MonitorController.php b/app/Http/Controllers/MonitorController.php
index dbbbd1a4e2..6f1b45f9f5 100644
--- a/app/Http/Controllers/MonitorController.php
+++ b/app/Http/Controllers/MonitorController.php
@@ -33,7 +33,7 @@ public function get(): JsonResponse
         }
 
         // Choose colors for the chart based on user preferences.
-        if (array_key_exists('colorblind', $_COOKIE) && intval($_COOKIE['colorblind']) === 1) {
+        if (array_key_exists('colorblind', $_COOKIE) && (int) $_COOKIE['colorblind'] === 1) {
             $palette = HighContrastPalette::class;
         } else {
             $palette = ClassicPalette::class;
diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
index edead1d318..2da9f7ed7a 100644
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -23,7 +23,7 @@ public function apiCreateProject(): JsonResponse
 
         if (isset($_GET['projectid'])) {
             // We're editing a project if a projectid was specified
-            $this->setProjectById(intval($_GET['projectid']));
+            $this->setProjectById((int) $_GET['projectid']);
         } else {
             // We're going to create a new project
             $this->project = new Project();
@@ -118,7 +118,7 @@ public function apiCreateProject(): JsonResponse
             $project_response['TestTimeMaxStatus'] = 3;
             $project_response['TestTimeStd'] = 4.0;
             $project_response['TestTimeStdThreshold'] = 1.0;
-            if (!boolval(config('cdash.user_create_projects')) || $User->admin) {
+            if (!(bool) config('cdash.user_create_projects') || $User->admin) {
                 $project_response['UploadQuota'] = 1;
             }
             $project_response['WarningsFilter'] = '';
diff --git a/app/Http/Controllers/ProjectOverviewController.php b/app/Http/Controllers/ProjectOverviewController.php
index 7bf23366af..a06de77389 100644
--- a/app/Http/Controllers/ProjectOverviewController.php
+++ b/app/Http/Controllers/ProjectOverviewController.php
@@ -132,7 +132,7 @@ public function apiOverview(): JsonResponse
                 $coverage_category = [];
                 $coverage_category['name'] = 'Total';
                 $coverage_category['position'] = 0;
-                $threshold = intval($this->project->CoverageThreshold);
+                $threshold = (int) $this->project->CoverageThreshold;
                 $coverage_category['low'] = 0.7 * $threshold;
                 $coverage_category['medium'] = $threshold;
                 $coverage_category['satisfactory'] = 100;
@@ -258,7 +258,7 @@ public function apiOverview(): JsonResponse
             if ($static_name) {
                 foreach ($static_measurements as $measurement) {
                     if (!array_key_exists($measurement, $overview_data[$day][$static_name])) {
-                        $overview_data[$day][$static_name][$measurement] = intval($build_row->{"build_$measurement"});
+                        $overview_data[$day][$static_name][$measurement] = (int) $build_row->{"build_$measurement"};
                     } else {
                         $overview_data[$day][$static_name][$measurement] += $build_row->{"build_$measurement"};
                     }
@@ -286,7 +286,7 @@ public function apiOverview(): JsonResponse
                 foreach ($build_measurements as $measurement) {
                     $clean_measurement = $clean_measurements[$measurement];
                     if (!array_key_exists($measurement, $overview_data[$day][$group_name])) {
-                        $overview_data[$day][$group_name][$measurement] = intval($build_row->$clean_measurement);
+                        $overview_data[$day][$group_name][$measurement] = (int) $build_row->$clean_measurement;
                     } else {
                         $overview_data[$day][$group_name][$measurement] += $build_row->$clean_measurement;
                     }
@@ -325,16 +325,16 @@ public function apiOverview(): JsonResponse
                                               LEFT JOIN coveragesummary AS cs ON (cs.buildid=b.id)
                                               LEFT JOIN subproject as sp ON (b.subprojectid = sp.id)
                                               WHERE b.parentid=?
-                                          ', [intval($build_row->id)]);
+                                          ', [(int) $build_row->id]);
                     foreach ($child_builds_array as $child_build_row) {
-                        $loctested = intval($child_build_row->loctested);
-                        $locuntested = intval($child_build_row->locuntested);
+                        $loctested = (int) $child_build_row->loctested;
+                        $locuntested = (int) $child_build_row->locuntested;
                         if ($loctested + $locuntested === 0) {
                             continue;
                         }
 
                         $subproject_group_id = $child_build_row->subprojectgroupid;
-                        if (is_null($subproject_group_id)) {
+                        if (null === $subproject_group_id) {
                             continue;
                         }
 
@@ -361,9 +361,9 @@ public function apiOverview(): JsonResponse
                 // Record the number of defects for this day / checker / build group.
                 $dynamic_analysis_array = &$dynamic_analysis_data[$day][$group_name];
                 if (!array_key_exists($checker, $dynamic_analysis_array)) {
-                    $dynamic_analysis_array[$checker] = intval($build_row->numdefects);
+                    $dynamic_analysis_array[$checker] = (int) $build_row->numdefects;
                 } else {
-                    $dynamic_analysis_array[$checker] += intval($build_row->numdefects);
+                    $dynamic_analysis_array[$checker] += (int) $build_row->numdefects;
                 }
             }
         }
@@ -765,7 +765,7 @@ public function apiManageOverview(): JsonResponse
         $response['hidenav'] = 1;
 
         // Make sure the user has admin rights to this project.
-        $this->setProjectById(intval(request()->input('projectid')));
+        $this->setProjectById((int) request()->input('projectid'));
         Gate::authorize('edit-project', $this->project);
 
         get_dashboard_JSON($this->project->GetName(), null, $response);
@@ -773,9 +773,9 @@ public function apiManageOverview(): JsonResponse
         // Check if we are saving an overview layout.
         if (Request::isMethod('post') && request()->has('saveLayout')) {
             $inputRows = json_decode(request()->input('saveLayout'), true);
-            if (!is_null($inputRows)) {
+            if (null !== $inputRows) {
                 // Remove any old overview layout from this project.
-                DB::delete('DELETE FROM overview_components WHERE projectid=?', [intval($this->project->Id)]);
+                DB::delete('DELETE FROM overview_components WHERE projectid=?', [(int) $this->project->Id]);
 
                 if (count($inputRows) > 0) {
                     // Construct a query to insert the new layout.
@@ -783,9 +783,9 @@ public function apiManageOverview(): JsonResponse
                     $params = [];
                     foreach ($inputRows as $inputRow) {
                         $query .= '(?, ?, ?, ?),';
-                        $params[] = intval($this->project->Id);
-                        $params[] = intval($inputRow['id']);
-                        $params[] = intval($inputRow['position']);
+                        $params[] = (int) $this->project->Id;
+                        $params[] = (int) $inputRow['id'];
+                        $params[] = (int) $inputRow['position'];
                         $params[] = $inputRow['type'];
                     }
 
@@ -810,13 +810,13 @@ public function apiManageOverview(): JsonResponse
                      LEFT JOIN buildgroup AS bg ON (obg.buildgroupid = bg.id)
                      WHERE obg.projectid = ?
                      ORDER BY obg.position
-                 ', [intval($this->project->Id)]);
+                 ', [(int) $this->project->Id]);
 
         $build_response = [];
         $static_response = [];
         foreach ($query as $overviewgroup_row) {
             $group_response = [
-                'id' => intval($overviewgroup_row->id),
+                'id' => (int) $overviewgroup_row->id,
                 'name' => $overviewgroup_row->name,
             ];
             $type = $overviewgroup_row->type;
@@ -845,12 +845,12 @@ public function apiManageOverview(): JsonResponse
                                WHERE
                                    bg.projectid=?
                                    AND oc.buildgroupid IS NULL
-                           ', [intval($this->project->Id)]);
+                           ', [(int) $this->project->Id]);
 
         $availablegroups_response = [];
         foreach ($buildgroup_rows as $buildgroup_row) {
             $availablegroups_response[] = [
-                'id' => intval($buildgroup_row->id),
+                'id' => (int) $buildgroup_row->id,
                 'name' => $buildgroup_row->name,
             ];
         }
diff --git a/app/Http/Controllers/SubProjectController.php b/app/Http/Controllers/SubProjectController.php
index 0b3c81e9fe..e91e6393c9 100644
--- a/app/Http/Controllers/SubProjectController.php
+++ b/app/Http/Controllers/SubProjectController.php
@@ -42,13 +42,13 @@ public function apiManageSubProject(): JsonResponse
         $user = Auth::user();
 
         // List the available projects that this user has admin rights to.
-        $projectid = intval($_GET['projectid'] ?? 0);
+        $projectid = (int) ($_GET['projectid'] ?? 0);
 
         $sql = 'SELECT id, name FROM project';
         $params = [];
         if (!$user->admin) {
             $sql .= ' WHERE id IN (SELECT projectid AS id FROM user2project WHERE userid = ? AND role > 0)';
-            $params[] = intval(Auth::id());
+            $params[] = (int) Auth::id();
         }
 
         $projects = DB::select($sql, $params);
@@ -58,7 +58,7 @@ public function apiManageSubProject(): JsonResponse
                 'id' => $project_array->id,
                 'name' => $project_array->name,
             ];
-            if (intval($project_array->id) === $projectid) {
+            if ((int) $project_array->id === $projectid) {
                 $availableproject['selected'] = '1';
             }
             $availableprojects[] = $availableproject;
diff --git a/app/Http/Controllers/SubmissionController.php b/app/Http/Controllers/SubmissionController.php
index b6cf64b3bb..79b4e5c346 100644
--- a/app/Http/Controllers/SubmissionController.php
+++ b/app/Http/Controllers/SubmissionController.php
@@ -160,7 +160,7 @@ private function submitProcess(): Response
             Storage::delete("inbox/{$filename}");
             Log::info('Rejected submission with invalid authentication token');
             $this->failProcessing(null, Response::HTTP_FORBIDDEN, 'Invalid Token');
-        } elseif (intval($this->project->Id) < 1) {
+        } elseif ((int) $this->project->Id < 1) {
             Log::info("Rejected submission with invalid project name: $projectname");
             $this->failProcessing($filename, Response::HTTP_NOT_FOUND, 'The requested project does not exist.');
         }
diff --git a/app/Http/Controllers/SubscribeProjectController.php b/app/Http/Controllers/SubscribeProjectController.php
index 7b273a8a2b..91795bcf50 100644
--- a/app/Http/Controllers/SubscribeProjectController.php
+++ b/app/Http/Controllers/SubscribeProjectController.php
@@ -72,12 +72,12 @@ public function subscribeProject(): View|RedirectResponse
         }
 
         if ($UpdateSubscription) {
-            $emailcategory_update = intval($_POST['emailcategory_update'] ?? 0);
-            $emailcategory_configure = intval($_POST['emailcategory_configure'] ?? 0);
-            $emailcategory_warning = intval($_POST['emailcategory_warning'] ?? 0);
-            $emailcategory_error = intval($_POST['emailcategory_error'] ?? 0);
-            $emailcategory_test = intval($_POST['emailcategory_test'] ?? 0);
-            $emailcategory_dynamicanalysis = intval($_POST['emailcategory_dynamicanalysis'] ?? 0);
+            $emailcategory_update = (int) ($_POST['emailcategory_update'] ?? 0);
+            $emailcategory_configure = (int) ($_POST['emailcategory_configure'] ?? 0);
+            $emailcategory_warning = (int) ($_POST['emailcategory_warning'] ?? 0);
+            $emailcategory_error = (int) ($_POST['emailcategory_error'] ?? 0);
+            $emailcategory_test = (int) ($_POST['emailcategory_test'] ?? 0);
+            $emailcategory_dynamicanalysis = (int) ($_POST['emailcategory_dynamicanalysis'] ?? 0);
 
             $EmailCategory = $emailcategory_update + $emailcategory_configure + $emailcategory_warning + $emailcategory_error + $emailcategory_test + $emailcategory_dynamicanalysis;
             if (!empty($user2project)) {
@@ -116,7 +116,7 @@ public function subscribeProject(): View|RedirectResponse
             $xml .= '<availableproject>';
             $xml .= add_XML_value('id', $project->id);
             $xml .= add_XML_value('name', $project->name);
-            if (intval($project->id) === $this->project->Id) {
+            if ((int) $project->id === $this->project->Id) {
                 $xml .= add_XML_value('selected', '1');
             }
             $xml .= '</availableproject>';
diff --git a/app/Http/Controllers/TestController.php b/app/Http/Controllers/TestController.php
index b56320be33..e03b2444f9 100644
--- a/app/Http/Controllers/TestController.php
+++ b/app/Http/Controllers/TestController.php
@@ -109,7 +109,7 @@ public function apiTestSummary(): JsonResponse|StreamedResponse
         if (strlen($date) === 0) {
             abort(400, 'No date specified.');
         }
-        $this->setProjectById(intval($_GET['project'] ?? -1));
+        $this->setProjectById((int) ($_GET['project'] ?? -1));
 
         $testName = $_GET['name'] ?? '';
         if ($testName === '' || !is_string($testName)) {
@@ -160,7 +160,7 @@ public function apiTestSummary(): JsonResponse|StreamedResponse
                 AND build.starttime<?
                 AND build.projectid=?
             GROUP by testmeasurement.name
-        ', [$testName, $beginning_UTCDate, $end_UTCDate, intval($this->project->Id)]);
+        ', [$testName, $beginning_UTCDate, $end_UTCDate, (int) $this->project->Id]);
 
         $columns = [];
         $response['hasprocessors'] = false;
@@ -211,7 +211,7 @@ public function apiTestSummary(): JsonResponse|StreamedResponse
                 ORDER BY
                     build2test.buildid,
                     testmeasurement.name
-            ', [$testName, $beginning_UTCDate, $end_UTCDate, intval($this->project->Id)]);
+            ', [$testName, $beginning_UTCDate, $end_UTCDate, (int) $this->project->Id]);
         }
 
         $result = DB::select('
@@ -230,7 +230,7 @@ public function apiTestSummary(): JsonResponse|StreamedResponse
                 b2t.testname = ?
                 AND b.projectid = ?
                 AND b.starttime BETWEEN ? AND ?
-        ', [$testName, intval($this->project->Id), $beginning_UTCDate, $end_UTCDate]);
+        ', [$testName, (int) $this->project->Id, $beginning_UTCDate, $end_UTCDate]);
 
         // If user wants to export as CSV file.
         if (isset($_GET['export']) && $_GET['export'] === 'csv') {
@@ -353,7 +353,7 @@ public function apiTestSummary(): JsonResponse|StreamedResponse
             $build_response['site'] = $row->sitename;
             $build_response['buildName'] = $row->name;
             $build_response['buildStamp'] = $row->stamp;
-            $build_response['time'] = floatval($row->time);
+            $build_response['time'] = (float) $row->time;
 
             $buildLink = "builds/$buildid/tests";
             $build_response['buildid'] = $buildid;
@@ -416,7 +416,7 @@ public function apiTestSummary(): JsonResponse|StreamedResponse
                 ORDER BY
                     build2test.buildid,
                     testmeasurement.name
-            ', [$testName, $beginning_UTCDate, $end_UTCDate, intval($this->project->Id)]);
+            ', [$testName, $beginning_UTCDate, $end_UTCDate, (int) $this->project->Id]);
             if (is_array($etestquery)) {
                 foreach ($etestquery as $row) {
                     // Get the index of this measurement in the list of columns.
@@ -439,7 +439,7 @@ public function apiTestSummary(): JsonResponse|StreamedResponse
                 if (!$num_procs) {
                     $num_procs = 1;
                 }
-                $builds_response[$i]['proctime'] = floatval($builds_response[$i]['time'] * $num_procs);
+                $builds_response[$i]['proctime'] = (float) ($builds_response[$i]['time'] * $num_procs);
             }
         }
 
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index e56960daaa..4616f60eae 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -58,7 +58,7 @@ public function userPageContent(): JsonResponse
         $response['user_is_admin'] = $user->admin;
         $response['show_monitor'] = config('queue.default') === 'database';
 
-        if (boolval(config('cdash.user_create_projects'))) {
+        if ((bool) config('cdash.user_create_projects')) {
             $response['user_can_create_projects'] = 1;
         } else {
             $response['user_can_create_projects'] = 0;
@@ -143,7 +143,7 @@ public function userPageContent(): JsonResponse
             pdo_execute($stmt, array_merge($query_params, [$userid]));
             while ($row = $stmt->fetch()) {
                 $Project = new Project();
-                $Project->Id = intval($row['projectid']);
+                $Project->Id = (int) $row['projectid'];
                 $Project->Fill();
 
                 $claimedproject = [];
@@ -162,13 +162,13 @@ public function userPageContent(): JsonResponse
             $claimedsite_response['name'] = $site['name'];
             $claimedsite_response['outoforder'] = $site['outoforder'];
 
-            $siteid = intval($site['id']);
+            $siteid = (int) $site['id'];
 
             $siteprojects_response = [];
             foreach ($claimedsiteprojects as $project) {
                 $siteproject_response = [];
 
-                $projectid = intval($project['id']);
+                $projectid = (int) $project['id'];
                 $projectname = $project['name'];
                 $nightlytime = $project['nightlytime'];
 
@@ -226,7 +226,7 @@ private static function GetBuildsDailyAverage(int $projectid, string $startUTCda
         }
         $first_build = $project[0]->starttime;
         $nb_days = strtotime($endUTCdate) - strtotime($first_build);
-        $nb_days = intval($nb_days / 86400) + 1;
+        $nb_days = (int) ($nb_days / 86400) + 1;
         $nbuilds = \App\Models\Project::findOrFail($projectid)
             ->builds()
             ->betweenDates(Carbon::parse($startUTCdate), Carbon::parse($endUTCdate))
diff --git a/app/Http/Controllers/ViewTestController.php b/app/Http/Controllers/ViewTestController.php
index aa432f063d..1a95113f40 100644
--- a/app/Http/Controllers/ViewTestController.php
+++ b/app/Http/Controllers/ViewTestController.php
@@ -72,7 +72,7 @@ public function fetchPageContent(): JsonResponse|StreamedResponse
     private static function get_request_build($required = true): ?Build
     {
         $id = self::get_request_build_id($required);
-        if (is_null($id)) {
+        if (null === $id) {
             return null;
         }
         $build = new Build();
@@ -103,7 +103,7 @@ private static function get_request_build_id($required = true): ?int
     private static function get_int_param($name, $required = true): ?int
     {
         $value = get_param($name, $required);
-        if (is_null($value)) {
+        if (null === $value) {
             return null;
         }
 
diff --git a/app/Http/Submission/Handlers/BazelJSONHandler.php b/app/Http/Submission/Handlers/BazelJSONHandler.php
index 8b48631761..45c2fb21e4 100644
--- a/app/Http/Submission/Handlers/BazelJSONHandler.php
+++ b/app/Http/Submission/Handlers/BazelJSONHandler.php
@@ -196,7 +196,7 @@ public function Parse($filename)
     public function ParseLine($line)
     {
         $json_array = json_decode($line, true);
-        if (is_null($json_array)) {
+        if (null === $json_array) {
             Log::error('json_decode error: ' . json_last_error_msg(), [
                 'function' => 'BazelJSONHandler::ParseLine',
             ]);
@@ -216,7 +216,7 @@ public function ParseLine($line)
                 if ($this->HasSubProjects()) {
                     $target_name = $json_array['id']['pattern']['pattern'][0];
                     $subproject_name = self::GetSubProjectForPath(
-                        $target_name, intval($this->GetProject()->Id));
+                        $target_name, (int) $this->GetProject()->Id);
                     if (!empty($subproject_name)) {
                         $this->InitializeSubProjectBuild($subproject_name);
                     }
@@ -360,7 +360,7 @@ public function ParseLine($line)
                                 $subproject_name = '';
                                 if ($this->HasSubProjects()) {
                                     $subproject_name = self::GetSubProjectForPath(
-                                        $source_file, intval($this->GetProject()->Id));
+                                        $source_file, (int) $this->GetProject()->Id);
                                     // Skip this defect if we cannot deduce what SubProject
                                     // it belongs to.
                                     if (empty($subproject_name)) {
@@ -432,7 +432,7 @@ public function ParseLine($line)
                             if ($record_error) {
                                 // Record any existing build error before creating
                                 // a new one.
-                                if (!is_null($build_error)) {
+                                if (null !== $build_error) {
                                     $this->RecordError($build_error, $type, $subproject_name);
                                     $subproject_name = '';
                                     $build_error = null;
@@ -484,7 +484,7 @@ public function ParseLine($line)
                                     // Look up the subproject (if any) that contains
                                     // this source file.
                                     $subproject_name = self::GetSubProjectForPath(
-                                        $source_file, intval($this->GetProject()->Id));
+                                        $source_file, (int) $this->GetProject()->Id);
                                     // Skip this defect if we cannot deduce what SubProject
                                     // it belongs to.
                                     if (empty($subproject_name)) {
@@ -492,7 +492,7 @@ public function ParseLine($line)
                                     }
                                     $this->InitializeSubProjectBuild($subproject_name);
                                 }
-                            } elseif (!is_null($build_error)) {
+                            } elseif (null !== $build_error) {
                                 // Record lines following the error/warning
                                 // as post context.
                                 $build_error->PostContext .= "$line\n";
@@ -501,7 +501,7 @@ public function ParseLine($line)
                         $log_line_number++;
                     }
 
-                    if (!is_null($build_error)) {
+                    if (null !== $build_error) {
                         $this->RecordError($build_error, $type, $subproject_name);
                         $build_error = null;
                     }
@@ -529,14 +529,14 @@ public function ParseLine($line)
                         // builds instead.
                         $target_name = $json_array['id']['testResult']['label'];
                         $subproject_name = self::GetSubProjectForPath(
-                            $target_name, intval($this->GetProject()->Id));
+                            $target_name, (int) $this->GetProject()->Id);
                         // Skip this defect if we cannot deduce what SubProject
                         // it belongs to.
                         if (empty($subproject_name)) {
                             break;
                         }
                         $child_build = $this->InitializeSubProjectBuild($subproject_name);
-                        if (!is_null($child_build)) {
+                        if (null !== $child_build) {
                             $child_build->InsertErrors = false;
                             SubmissionUtils::add_build($child_build);
                             $buildid = $child_build->Id;
@@ -584,7 +584,7 @@ public function ParseLine($line)
                     // builds instead.
                     $target_name = $json_array['id']['testSummary']['label'];
                     $subproject_name = self::GetSubProjectForPath(
-                        $target_name, intval($this->GetProject()->Id));
+                        $target_name, (int) $this->GetProject()->Id);
                     // Skip this defect if we cannot deduce what SubProject
                     // it belongs to.
                     if (empty($subproject_name)) {
diff --git a/app/Http/Submission/Handlers/ConfigureHandler.php b/app/Http/Submission/Handlers/ConfigureHandler.php
index fb552aad8d..321ed52013 100644
--- a/app/Http/Submission/Handlers/ConfigureHandler.php
+++ b/app/Http/Submission/Handlers/ConfigureHandler.php
@@ -192,7 +192,7 @@ public function endElement($parser, $name): void
                             if ($existing_config_results) {
                                 // Combine these with the data we just parsed out of the XML.
                                 $this->Configure->Log = $existing_config_results->log . "\n" . $this->Configure->Log;
-                                $this->Configure->Status = intval($existing_config_results->status) + intval($this->Configure->Status);
+                                $this->Configure->Status = (int) $existing_config_results->status + (int) $this->Configure->Status;
 
                                 // Also reuse the prior start time for this configure step.
                                 $existing_start_timestamp = strtotime($existing_config_results->starttime . ' UTC');
diff --git a/app/Http/Submission/Handlers/CoverageHandler.php b/app/Http/Submission/Handlers/CoverageHandler.php
index 77bcf73eeb..ba175ea00d 100644
--- a/app/Http/Submission/Handlers/CoverageHandler.php
+++ b/app/Http/Submission/Handlers/CoverageHandler.php
@@ -144,11 +144,11 @@ public function endElement($parser, $name): void
                     // Make sure this file gets associated with the correct SubProject.
                     $subproject = SubProject::GetSubProjectFromPath(
                         $coverageFile->FullPath, $this->GetProject()->Id);
-                    if (!is_null($subproject)) {
+                    if (null !== $subproject) {
                         // Find the sibling build that performed this SubProject.
                         $subprojectBuild = Build::GetSubProjectBuild(
                             $this->Build->GetParentId(), $subproject->GetId());
-                        if (is_null($subprojectBuild)) {
+                        if (null === $subprojectBuild) {
                             // Build doesn't exist yet, add it here.
                             $subprojectBuild = new Build();
                             $subprojectBuild->Name = $this->Build->Name;
diff --git a/app/Http/Submission/Handlers/CoverageJUnitHandler.php b/app/Http/Submission/Handlers/CoverageJUnitHandler.php
index 7aedb3f73d..cb849df05d 100644
--- a/app/Http/Submission/Handlers/CoverageJUnitHandler.php
+++ b/app/Http/Submission/Handlers/CoverageJUnitHandler.php
@@ -107,27 +107,27 @@ public function startElement($parser, $name, $attributes): void
         } elseif ($parent === 'REPORT' && $name === 'COUNTER') {
             switch ($attributes['TYPE']) {
                 case 'COMPLEXITY':
-                    $this->CoverageSummary->BranchesTested = intval($attributes['COVERED']);
-                    $this->CoverageSummary->BranchesUntested = intval($attributes['MISSED']);
+                    $this->CoverageSummary->BranchesTested = (int) $attributes['COVERED'];
+                    $this->CoverageSummary->BranchesUntested = (int) $attributes['MISSED'];
                     break;
                 case 'METHOD':
-                    $this->CoverageSummary->FunctionsTested = intval($attributes['COVERED']);
-                    $this->CoverageSummary->FunctionsUntested = intval($attributes['MISSED']);
+                    $this->CoverageSummary->FunctionsTested = (int) $attributes['COVERED'];
+                    $this->CoverageSummary->FunctionsUntested = (int) $attributes['MISSED'];
                     break;
             }
         } elseif ($parent === 'SOURCEFILE' && $name === 'COUNTER') {
             switch ($attributes['TYPE']) {
                 case 'LINE':
-                    $this->Coverage->LocTested = intval($attributes['COVERED']);
-                    $this->Coverage->LocUntested = intval($attributes['MISSED']);
+                    $this->Coverage->LocTested = (int) $attributes['COVERED'];
+                    $this->Coverage->LocUntested = (int) $attributes['MISSED'];
                     break;
                 case 'COMPLEXITY':
-                    $this->Coverage->BranchesTested = intval($attributes['COVERED']);
-                    $this->Coverage->BranchesUntested = intval($attributes['MISSED']);
+                    $this->Coverage->BranchesTested = (int) $attributes['COVERED'];
+                    $this->Coverage->BranchesUntested = (int) $attributes['MISSED'];
                     break;
                 case 'METHOD':
-                    $this->Coverage->FunctionsTested = intval($attributes['COVERED']);
-                    $this->Coverage->FunctionsUntested = intval($attributes['MISSED']);
+                    $this->Coverage->FunctionsTested = (int) $attributes['COVERED'];
+                    $this->Coverage->FunctionsUntested = (int) $attributes['MISSED'];
                     break;
             }
         }
diff --git a/app/Http/Submission/Handlers/CoverageLogHandler.php b/app/Http/Submission/Handlers/CoverageLogHandler.php
index 2d2d88b151..361796d99c 100644
--- a/app/Http/Submission/Handlers/CoverageLogHandler.php
+++ b/app/Http/Submission/Handlers/CoverageLogHandler.php
@@ -111,11 +111,11 @@ public function endElement($parser, $name): void
                     // Make sure this file gets associated with the correct
                     // subproject based on its path.
                     $subproject = SubProject::GetSubProjectFromPath(
-                        $coverageFile->FullPath, intval($this->GetProject()->Id));
-                    if (!is_null($subproject)) {
+                        $coverageFile->FullPath, (int) $this->GetProject()->Id);
+                    if (null !== $subproject) {
                         $subprojectBuild = Build::GetSubProjectBuild(
                             $this->Build->GetParentId(), $subproject->GetId());
-                        if (is_null($subprojectBuild)) {
+                        if (null === $subprojectBuild) {
                             // This SubProject build doesn't exist yet, add it here.
                             $subprojectBuild = new Build();
                             $subprojectBuild->ProjectId = $this->GetProject()->Id;
diff --git a/app/Http/Submission/Handlers/GcovTarHandler.php b/app/Http/Submission/Handlers/GcovTarHandler.php
index baecf44938..4d82e8fb30 100644
--- a/app/Http/Submission/Handlers/GcovTarHandler.php
+++ b/app/Http/Submission/Handlers/GcovTarHandler.php
@@ -72,7 +72,7 @@ public function Parse(string $filename): bool
             if ($fileinfo->getFilename() === 'data.json') {
                 $jsonContents = file_get_contents($fileinfo->getPath() . DIRECTORY_SEPARATOR . $fileinfo->getFilename());
                 $jsonDecoded = json_decode($jsonContents, true);
-                if (is_null($jsonDecoded) || !array_key_exists('Source', $jsonDecoded)
+                if (null === $jsonDecoded || !array_key_exists('Source', $jsonDecoded)
                     || !array_key_exists('Binary', $jsonDecoded)
                 ) {
                     DeleteDirectory($dirName);
@@ -197,7 +197,7 @@ public function ParseGcovFile($fileinfo): void
         ) {
             // Find the SubProject that corresponds to this path.
             $subproject = SubProject::GetSubProjectFromPath($path, $this->GetProject()->Id);
-            if (is_null($subproject)) {
+            if (null === $subproject) {
                 // Error already logged.
                 return;
             }
@@ -205,7 +205,7 @@ public function ParseGcovFile($fileinfo): void
 
             // Find the sibling build that performed this SubProject.
             $siblingBuild = Build::GetSubProjectBuild($this->Build->GetParentId(), $subprojectid);
-            if (is_null($siblingBuild)) {
+            if (null === $siblingBuild) {
                 // Build doesn't exist yet, add it here.
                 $siblingBuild = new Build();
                 $siblingBuild->Name = $this->Build->Name;
@@ -397,7 +397,7 @@ public function ParseLabelsFile($fileinfo): void
         // read the file & decode the JSON.
         $jsonContents = file_get_contents($fileinfo->getPath() . DIRECTORY_SEPARATOR . $fileinfo->getFilename());
         $jsonDecoded = json_decode($jsonContents, true);
-        if (is_null($jsonDecoded) || !array_key_exists('sources', $jsonDecoded)) {
+        if (null === $jsonDecoded || !array_key_exists('sources', $jsonDecoded)) {
             return;
         }
 
diff --git a/app/Http/Submission/Handlers/JSCoverTarHandler.php b/app/Http/Submission/Handlers/JSCoverTarHandler.php
index 19bf2c9ac5..0421f1e27b 100644
--- a/app/Http/Submission/Handlers/JSCoverTarHandler.php
+++ b/app/Http/Submission/Handlers/JSCoverTarHandler.php
@@ -125,7 +125,7 @@ public function ParseJSCoverFile($fileinfo): void
         $jsonDecoded = json_decode($jsonContents, true);
         foreach ($jsonDecoded as $path => $coverageEntry) {
             // Make sure it has the fields we expect.
-            if (is_null($coverageEntry)
+            if (null === $coverageEntry
                 || !array_key_exists('source', $coverageEntry)
                 || !array_key_exists('coverage', $coverageEntry)
             ) {
@@ -196,7 +196,7 @@ public function ParseJSCoverFile($fileinfo): void
                 } else {
                     // value in entry indicates total times hit,
                     // coerce the string to a number.
-                    $timesHit = intval($timesHit);
+                    $timesHit = (int) $timesHit;
                 }
                 $coverageFileLog->AddLine($i - 1, $timesHit);
             }
diff --git a/app/Http/Submission/Handlers/JavaJSONTarHandler.php b/app/Http/Submission/Handlers/JavaJSONTarHandler.php
index 17b073d505..76d2700fdd 100644
--- a/app/Http/Submission/Handlers/JavaJSONTarHandler.php
+++ b/app/Http/Submission/Handlers/JavaJSONTarHandler.php
@@ -101,7 +101,7 @@ public function ParsePackageMap($fileinfo): void
     {
         $jsonContents = file_get_contents($fileinfo->getPath() . DIRECTORY_SEPARATOR . $fileinfo->getFilename());
         $jsonDecoded = json_decode($jsonContents, true);
-        if (is_null($jsonDecoded)) {
+        if (null === $jsonDecoded) {
             return;
         }
 
@@ -149,7 +149,7 @@ public function ParseJavaJSONFile($fileinfo): void
         $jsonDecoded = json_decode($jsonContents, true);
 
         // Make sure it has the fields we expect.
-        if (is_null($jsonDecoded)
+        if (null === $jsonDecoded
             || !array_key_exists('file', $jsonDecoded)
             || !array_key_exists('package', $jsonDecoded)
             || !array_key_exists('lines', $jsonDecoded)
diff --git a/app/Http/Submission/Handlers/OpenCoverTarHandler.php b/app/Http/Submission/Handlers/OpenCoverTarHandler.php
index 34c2775496..5b0677ccd7 100644
--- a/app/Http/Submission/Handlers/OpenCoverTarHandler.php
+++ b/app/Http/Submission/Handlers/OpenCoverTarHandler.php
@@ -254,15 +254,15 @@ public function readSourceFile($buildid, $fileinfo)
 
                 $this->coverageFile->File .= $line;
                 if (!(preg_match("/^\/\//", $trimmedLine)
-                   or preg_match('/using /', $trimmedLine)
-                   or preg_match('/^namespace/', $trimmedLine)
-                   or preg_match('/^public/', $trimmedLine)
-                   or preg_match('/^protected/', $trimmedLine)
-                   or preg_match('/^private/', $trimmedLine)
-                   or preg_match("/^\[/", $trimmedLine)
-                   or preg_match('/[{}]/', $trimmedLine)
-                   or ('' == $trimmedLine)
-                   or $inlongComment
+                   || preg_match('/using /', $trimmedLine)
+                   || preg_match('/^namespace/', $trimmedLine)
+                   || preg_match('/^public/', $trimmedLine)
+                   || preg_match('/^protected/', $trimmedLine)
+                   || preg_match('/^private/', $trimmedLine)
+                   || preg_match("/^\[/", $trimmedLine)
+                   || preg_match('/[{}]/', $trimmedLine)
+                   || ('' == $trimmedLine)
+                   || $inlongComment
                 ) && $this->ParseCSFiles) {
                     $this->coverageFileLog->AddLine($key, 0);
                 }
diff --git a/app/Http/Submission/Handlers/ProjectHandler.php b/app/Http/Submission/Handlers/ProjectHandler.php
index a7deabcfb4..81681c90c3 100644
--- a/app/Http/Submission/Handlers/ProjectHandler.php
+++ b/app/Http/Submission/Handlers/ProjectHandler.php
@@ -109,11 +109,11 @@ public function endElement($parser, $name): void
 
                     foreach ($removeids as $removeid) {
                         if (array_key_exists($removeid, $this->SubProjects)) {
-                            $subproject->RemoveDependency(intval($removeid));
+                            $subproject->RemoveDependency((int) $removeid);
                         } else {
                             // TODO: (williamjallen) Rewrite this loop to not make repetitive queries
-                            $dep = DB::select('SELECT name FROM subproject WHERE id=?', [intval($removeid)])[0] ?? [];
-                            $dep = $dep !== [] ? $dep->name : intval($removeid);
+                            $dep = DB::select('SELECT name FROM subproject WHERE id=?', [(int) $removeid])[0] ?? [];
+                            $dep = $dep !== [] ? $dep->name : (int) $removeid;
                             Log::warning("Not removing dependency $dep($removeid) from " . $subproject->GetName() .
                                 ' because it is not a SubProject element in this Project.xml file', [
                                     'function' => 'ProjectHandler:endElement',
@@ -128,7 +128,7 @@ public function endElement($parser, $name): void
                 //
                 foreach ($this->Dependencies[$subproject->GetId()] as $addid) {
                     if (array_key_exists($addid, $this->SubProjects)) {
-                        $subproject->AddDependency(intval($addid));
+                        $subproject->AddDependency((int) $addid);
                     } else {
                         Log::warning('impossible condition: should NEVER see this: unknown DEPENDENCY clause should prevent this case', [
                             'function' => 'ProjectHandler:endElement',
diff --git a/app/Http/Submission/Handlers/RetryHandler.php b/app/Http/Submission/Handlers/RetryHandler.php
index 250f79f4f9..c169e86385 100644
--- a/app/Http/Submission/Handlers/RetryHandler.php
+++ b/app/Http/Submission/Handlers/RetryHandler.php
@@ -52,7 +52,7 @@ public function increment(): bool
         }
         $attributes = $xml->attributes();
         if (isset($attributes['retries'])) {
-            $this->Retries = intval($attributes['retries']) + 1;
+            $this->Retries = (int) $attributes['retries'] + 1;
         } else {
             $this->Retries = 1;
         }
diff --git a/app/Http/Submission/Handlers/TestingJUnitHandler.php b/app/Http/Submission/Handlers/TestingJUnitHandler.php
index 3ec6471011..8e185c7ff2 100644
--- a/app/Http/Submission/Handlers/TestingJUnitHandler.php
+++ b/app/Http/Submission/Handlers/TestingJUnitHandler.php
@@ -148,7 +148,7 @@ public function startElement($parser, $name, $attributes): void
             $this->TestCreator->testStatus = 'passed';
             if (array_key_exists('STATUS', $attributes)) {
                 $status = $attributes['STATUS'];
-                if (stripos($status, 'fail') !== false) {
+                if (str_contains(strtolower($status), strtolower('fail'))) {
                     $this->TestCreator->testStatus = 'failed';
                 }
                 if (strcasecmp($status, 'notrun') === 0) {
diff --git a/app/Jobs/PerformLegacyDailyUpdates.php b/app/Jobs/PerformLegacyDailyUpdates.php
index 50682a33b1..1d5cc5bb02 100644
--- a/app/Jobs/PerformLegacyDailyUpdates.php
+++ b/app/Jobs/PerformLegacyDailyUpdates.php
@@ -102,7 +102,7 @@ private function sendEmailExpectedBuilds($projectid, $currentstarttime): void
             $builtype = $build2grouprule_array['buildtype'];
             $buildname = $build2grouprule_array['buildname'];
             $sitename = $build2grouprule_array['name'];
-            $siteid = intval($build2grouprule_array['siteid']);
+            $siteid = (int) $build2grouprule_array['siteid'];
             $summary .= '* ' . $sitename . ' - ' . $buildname . ' (' . $builtype . ")\n";
 
             // Find the site maintainers
diff --git a/app/Jobs/ProcessSubmission.php b/app/Jobs/ProcessSubmission.php
index 58d38e4807..0f7a461e27 100644
--- a/app/Jobs/ProcessSubmission.php
+++ b/app/Jobs/ProcessSubmission.php
@@ -585,7 +585,7 @@ private static function send_update_email(UpdateHandler $handler, int $projectid
             $stamp = $handler->getBuildStamp();
             $sitename = $handler->getSiteName();
 
-            $buildid = intval(DB::select('
+            $buildid = (int) (DB::select('
             SELECT build.id AS id
             FROM build, site
             WHERE
@@ -616,7 +616,7 @@ private static function send_update_email(UpdateHandler $handler, int $projectid
         }
 
         // Send out update errors to site maintainers
-        $update_errors = self::check_email_update_errors(intval($buildid));
+        $update_errors = self::check_email_update_errors((int) $buildid);
         if ($update_errors['errors']) {
             // Find the site maintainer(s)
             $sitename = $handler->getSiteName();
diff --git a/app/Models/SubProject.php b/app/Models/SubProject.php
index 4bd558b409..ec57ae2ace 100644
--- a/app/Models/SubProject.php
+++ b/app/Models/SubProject.php
@@ -65,7 +65,7 @@ public function children(?Carbon $date = null): BelongsToMany
             $date = Carbon::now()->setTimezone('UTC');
         }
 
-        return $this->belongsToMany(SubProject::class, 'subproject2subproject', 'subprojectid', 'dependsonid')
+        return $this->belongsToMany(self::class, 'subproject2subproject', 'subprojectid', 'dependsonid')
             ->wherePivot('starttime', '<=', Carbon::now()->setTimezone('UTC'))
             ->where(function ($query) use ($date): void {
                 $query->where('subproject2subproject.endtime', '>', $date)
diff --git a/app/Models/Test.php b/app/Models/Test.php
index c4af6e3a84..6b58201a6a 100644
--- a/app/Models/Test.php
+++ b/app/Models/Test.php
@@ -134,7 +134,7 @@ public function testImages(): HasMany
      **/
     public function addLabel(Label $label): void
     {
-        if (is_null($this->labels)) {
+        if (null === $this->labels) {
             $this->labels = collect();
         }
         $this->labels->put($label->Text, $label);
@@ -147,7 +147,7 @@ public function addLabel(Label $label): void
      **/
     public function getLabels(): Collection
     {
-        if (is_null($this->labels)) {
+        if (null === $this->labels) {
             $this->labels = collect();
             foreach ($this->labels()->get() as $eloquent_label) {
                 $label = new Label();
diff --git a/app/Models/User.php b/app/Models/User.php
index 41e25b45ad..bd7a193ee4 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -30,10 +30,10 @@
  */
 class User extends Authenticatable implements MustVerifyEmail, LdapAuthenticatable
 {
+    use AuthenticatesWithLdap;
     /** @use HasFactory<UserFactory> */
     use HasFactory;
     use Notifiable;
-    use AuthenticatesWithLdap;
 
     protected $table = 'users';
 
diff --git a/app/Utils/AuthTokenUtil.php b/app/Utils/AuthTokenUtil.php
index 8fa4c18bbb..59dcc612e7 100644
--- a/app/Utils/AuthTokenUtil.php
+++ b/app/Utils/AuthTokenUtil.php
@@ -40,12 +40,12 @@ public static function generateToken(int $user_id, int $project_id, string $scop
         $now = time();
         $params['created'] = gmdate(FMT_DATETIME, $now);
 
-        if (!is_numeric($duration) || intval($duration) < 0) {
+        if (!is_numeric($duration) || (int) $duration < 0) {
             Log::error("Invalid token_duration configuration {$duration}");
             throw new InvalidArgumentException('Invalid token_duration configuration');
         }
 
-        if (intval($duration) === 0) {
+        if ((int) $duration === 0) {
             // this token "never" expires
             $params['expires'] = '9999-01-01 00:00:00';
         } else {
diff --git a/app/Utils/DatabaseCleanupUtils.php b/app/Utils/DatabaseCleanupUtils.php
index aed4c72a03..0960d9713a 100644
--- a/app/Utils/DatabaseCleanupUtils.php
+++ b/app/Utils/DatabaseCleanupUtils.php
@@ -128,7 +128,7 @@ public static function removeBuild($buildid): void
             if (!is_numeric($b)) {
                 throw new InvalidArgumentException('Invalid Build ID');
             }
-            $buildids[] = intval($b);
+            $buildids[] = (int) $b;
         }
 
         // Use Eloquent relationships to delete shared records that are only
@@ -206,7 +206,7 @@ public static function removeBuild($buildid): void
                                 ", array_merge($all_outputids, $buildids));
             $testoutputs_to_save = [];
             foreach ($save_test_result as $save_test_row) {
-                $testoutputs_to_save[] = intval($save_test_row->outputid);
+                $testoutputs_to_save[] = (int) $save_test_row->outputid;
             }
 
             // Use array_diff to get the list of tests that should be deleted.
@@ -231,7 +231,7 @@ public static function removeBuild($buildid): void
 
         $fileids = [];
         foreach ($build2uploadfiles as $build2uploadfile_array) {
-            $fileid = intval($build2uploadfile_array->fileid);
+            $fileid = (int) $build2uploadfile_array->fileid;
             $fileids[] = $fileid;
 
             $sha1sum = UploadFile::findOrFail($fileid)->sha1sum;
@@ -247,11 +247,11 @@ public static function removeBuild($buildid): void
         // In order to avoid making the list of builds to delete too large
         // we delete them in batches (one batch per parent).
         foreach ($buildids as $parentid) {
-            $child_result = DB::select('SELECT id FROM build WHERE parentid=?', [intval($parentid)]);
+            $child_result = DB::select('SELECT id FROM build WHERE parentid=?', [(int) $parentid]);
 
             $childids = [];
             foreach ($child_result as $child_array) {
-                $childids[] = intval($child_array->id);
+                $childids[] = (int) $child_array->id;
             }
             if (!empty($childids)) {
                 self::removeBuild($childids);
@@ -297,8 +297,8 @@ public static function deleteUnusedRows(string $table, string $field, string $ta
             return;
         }
 
-        $start = intval($start);
-        $max = intval($max);
+        $start = (int) $start;
+        $max = (int) $max;
         $total = $max - $start + 1;
         if ($total < 1) {
             Log::info("Invalid values found for min ({$start}) and/or max ({$max}) for `{$field}` on `{$table}`");
@@ -326,7 +326,7 @@ public static function deleteUnusedRows(string $table, string $field, string $ta
                 $percent = round(($num_done / $total) * 100, -1);
                 if ($percent > $next_report) {
                     Log::info("Cleaning `{$table}`: {$next_report}%");
-                    $next_report = $next_report + 10;
+                    $next_report += 10;
                 }
             }
         }
diff --git a/app/Utils/RepositoryUtils.php b/app/Utils/RepositoryUtils.php
index d0058e5cf1..dac09b9856 100644
--- a/app/Utils/RepositoryUtils.php
+++ b/app/Utils/RepositoryUtils.php
@@ -25,7 +25,7 @@ public static function get_source_dir($projectid, $projecturl, $file_path)
         $project = $service->get(Project::class);
         $project->Id = $projectid;
         $project->Fill();
-        if (is_null($project->CvsViewerType)) {
+        if (null === $project->CvsViewerType) {
             return;
         }
         $cvsviewertype = strtolower($project->CvsViewerType);
@@ -138,7 +138,7 @@ public static function get_revision_url($projectid, $revision, $priorrevision)
         }
 
         $db = Database::getInstance();
-        $project = $db->executePreparedSingleRow('SELECT cvsviewertype, cvsurl FROM project WHERE id=?', [intval($projectid)]);
+        $project = $db->executePreparedSingleRow('SELECT cvsviewertype, cvsurl FROM project WHERE id=?', [(int) $projectid]);
         $projecturl = $project['cvsurl'];
         $cvsviewertype = strtolower($project['cvsviewertype'] ?? '');
         $cvsviewerurl = $project['cvsurl'] ?? '';
@@ -242,7 +242,7 @@ public static function post_github_pull_request_comment(Project $project, $pull_
             }
         }
 
-        if (is_null($repo) || !isset($repo['username'])
+        if (null === $repo || !isset($repo['username'])
             || !isset($repo['password'])) {
             Log::warning("Missing repository info for project #$project->Id");
             return;
@@ -302,7 +302,7 @@ public static function generate_bugtracker_new_issue_link($build, $project)
         }
 
         // Use our email functions to generate a message body and title for this build.
-        $errors = self::check_email_errors(intval($build->Id), false, 0, true);
+        $errors = self::check_email_errors((int) $build->Id, false, 0, true);
         $emailtext = [];
         foreach ($errors as $errorkey => $nerrors) {
             if ($nerrors < 1) {
@@ -310,7 +310,7 @@ public static function generate_bugtracker_new_issue_link($build, $project)
             }
             $emailtext['nerror'] = 1;
             $emailtext['summary'][$errorkey] =
-                self::get_email_summary(intval($build->Id), $errors, $errorkey, 1, 500, 0, false);
+                self::get_email_summary((int) $build->Id, $errors, $errorkey, 1, 500, 0, false);
             $emailtext['category'][$errorkey] = $nerrors;
         }
         if (empty($emailtext)) {
diff --git a/app/Utils/SubmissionUtils.php b/app/Utils/SubmissionUtils.php
index beb459bb48..a9a74689c5 100644
--- a/app/Utils/SubmissionUtils.php
+++ b/app/Utils/SubmissionUtils.php
@@ -134,7 +134,7 @@ public static function add_build(Build $build)
         if (isset($build->SubProjectName) && $build->SubProjectName != '') {
             $BuildUpdate = new BuildUpdate();
             $BuildUpdate->BuildId = $build->Id;
-            $BuildUpdate->AssociateBuild(intval($build->SiteId), $build->Name, $build->GetStamp());
+            $BuildUpdate->AssociateBuild((int) $build->SiteId, $build->Name, $build->GetStamp());
         }
 
         return $build->Id;
diff --git a/app/Utils/TestingDay.php b/app/Utils/TestingDay.php
index 770faea3be..4225393844 100755
--- a/app/Utils/TestingDay.php
+++ b/app/Utils/TestingDay.php
@@ -42,9 +42,9 @@ public static function get(Project $project, $date): string
 
         // Extract hour, minute, and second from the project nightly start time.
         $current_nightly_timestamp = $project->NightlyDateTime->getTimestamp();
-        $hour = intval(date('H', $current_nightly_timestamp));
-        $minute = intval(date('i', $current_nightly_timestamp));
-        $second = intval(date('s', $current_nightly_timestamp));
+        $hour = (int) date('H', $current_nightly_timestamp);
+        $minute = (int) date('i', $current_nightly_timestamp);
+        $second = (int) date('s', $current_nightly_timestamp);
 
         // Get UNIX timestamp for input date (interpreted as UTC time).
         $build_datetime = new DateTime($date . ' UTC');
@@ -52,9 +52,9 @@ public static function get(Project $project, $date): string
 
         // Generate a DateTime object for our nightly starttime on the date
         // of the build and use it to get a corresponding UNIX timestamp.
-        $year = intval(date('Y', $build_start_timestamp));
-        $month = intval(date('n', $build_start_timestamp));
-        $day = intval(date('j', $build_start_timestamp));
+        $year = (int) date('Y', $build_start_timestamp);
+        $month = (int) date('n', $build_start_timestamp);
+        $day = (int) date('j', $build_start_timestamp);
 
         $nightly_datetime = new DateTime();
         $nightly_datetime->setTimezone($project->NightlyTimezone);
diff --git a/app/Utils/UnparsedSubmissionProcessor.php b/app/Utils/UnparsedSubmissionProcessor.php
index 344b21967e..c3f9c3c221 100644
--- a/app/Utils/UnparsedSubmissionProcessor.php
+++ b/app/Utils/UnparsedSubmissionProcessor.php
@@ -276,7 +276,7 @@ public function putSubmitFile(): JsonResponse
                 'name' => new ProjectNameRule(),
             ]);
 
-            if (is_null($projectname) || $validator->fails()) {
+            if (null === $projectname || $validator->fails()) {
                 Log::info("Could not find build metadata file for {$this->buildid}");
                 abort(Response::HTTP_NOT_FOUND, 'Build not found');
             }
diff --git a/app/cdash/app/Controller/Api/Index.php b/app/cdash/app/Controller/Api/Index.php
index af5eeee495..97dd4cff01 100644
--- a/app/cdash/app/Controller/Api/Index.php
+++ b/app/cdash/app/Controller/Api/Index.php
@@ -691,7 +691,7 @@ public function generateBuildResponseFromRow(array $build_array): array|false
                 $this->siteResponse['buildname'] = $build_array['name'];
                 $this->siteResponse['buildplatform'] = $buildplatform;
                 $this->siteResponse['generator'] = $build_array['generator'];
-                if (!is_null($changelink)) {
+                if (null !== $changelink) {
                     $this->siteResponse['changelink'] = $changelink;
                     $this->siteResponse['changeicon'] = $changeicon;
                 }
@@ -703,7 +703,7 @@ public function generateBuildResponseFromRow(array $build_array): array|false
             $build_response['buildname'] = $build_array['name'];
             $build_response['buildplatform'] = $buildplatform;
             $build_response['uploadfilecount'] = $build_array['builduploadfiles'];
-            if (!is_null($changelink)) {
+            if (null !== $changelink) {
                 $build_response['changelink'] = $changelink;
                 $build_response['changeicon'] = $changeicon;
             }
@@ -1299,7 +1299,7 @@ public function addExpectedBuilds(int $i, $currentstarttime): array
                         AND build2group.groupid=?
                     ORDER BY id DESC
                     LIMIT 5
-                ', [intval($siteid), $buildname, $buildtype, intval($groupid)]);
+                ', [(int) $siteid, $buildname, $buildtype, (int) $groupid]);
 
                 $time = 0;
                 foreach ($query as $query_array) {
diff --git a/app/cdash/app/Controller/Api/ResultsApi.php b/app/cdash/app/Controller/Api/ResultsApi.php
index 005db78354..4bc943fb04 100644
--- a/app/cdash/app/Controller/Api/ResultsApi.php
+++ b/app/cdash/app/Controller/Api/ResultsApi.php
@@ -97,7 +97,7 @@ public function setDate($date): void
         $this->project->Fill();
         [$previousdate, $beginning_timestamp, $nextdate, $d] =
             get_dates($date, $this->project->NightlyTime);
-        if (is_null($date)) {
+        if (null === $date) {
             $date = $d;
         }
         $this->date = $date;
diff --git a/app/cdash/app/Controller/Api/TestOverview.php b/app/cdash/app/Controller/Api/TestOverview.php
index f4469d2a4b..63c8d41f16 100644
--- a/app/cdash/app/Controller/Api/TestOverview.php
+++ b/app/cdash/app/Controller/Api/TestOverview.php
@@ -57,7 +57,7 @@ public function getResponse(): array
 
         // Handle optional "showpassed" argument.
         $showpassed = false;
-        if (isset($_GET['showpassed']) && intval($_GET['showpassed']) === 1) {
+        if (isset($_GET['showpassed']) && (int) $_GET['showpassed'] === 1) {
             $showpassed = true;
         }
         if ($showpassed) {
diff --git a/app/cdash/app/Controller/Api/Timeline.php b/app/cdash/app/Controller/Api/Timeline.php
index 2e22af2303..6cf9e15d91 100644
--- a/app/cdash/app/Controller/Api/Timeline.php
+++ b/app/cdash/app/Controller/Api/Timeline.php
@@ -308,10 +308,10 @@ private function getTimelineChartData($builds): array
             $this->initializeDate($start_of_day_ms, $test_date);
 
             // Keep track of oldest and newest date.
-            if (is_null($oldest_time_ms) || $start_of_day_ms < $oldest_time_ms) {
+            if (null === $oldest_time_ms || $start_of_day_ms < $oldest_time_ms) {
                 $oldest_time_ms = $start_of_day_ms;
             }
-            if (is_null($newest_time_ms) || $start_of_day_ms > $newest_time_ms) {
+            if (null === $newest_time_ms || $start_of_day_ms > $newest_time_ms) {
                 $newest_time_ms = $start_of_day_ms;
             }
 
@@ -330,7 +330,7 @@ private function getTimelineChartData($builds): array
             }
         }
 
-        if (is_null($oldest_time_ms)) {
+        if (null === $oldest_time_ms) {
             // No builds found.
             return [];
         }
diff --git a/app/cdash/app/Controller/Api/ViewTest.php b/app/cdash/app/Controller/Api/ViewTest.php
index df7931ff3b..2c3ffdd066 100644
--- a/app/cdash/app/Controller/Api/ViewTest.php
+++ b/app/cdash/app/Controller/Api/ViewTest.php
@@ -688,7 +688,7 @@ public static function marshal($data, $buildid, $projectname, $projectshowtestti
             'statusclass' => $marshaledStatus[1],
             'name' => $data['testname'],
             'execTime' => time_difference($data['time'], true, '', true),
-            'execTimeFull' => floatval($data['time']),
+            'execTimeFull' => (float) $data['time'],
             'details' => $data['details'],
             'summaryLink' => "queryTests.php?project={$projectname}&filtercount=1&showfilters=1&field1=testname&compare1=61&value1=" . urlencode($data['testname']) . "&date={$testdate}",
             'summary' => 'Summary', /* Default value later replaced by AJAX */
diff --git a/app/cdash/app/Lib/Repository/GitHub.php b/app/cdash/app/Lib/Repository/GitHub.php
index adc7f71dc0..52b0713026 100644
--- a/app/cdash/app/Lib/Repository/GitHub.php
+++ b/app/cdash/app/Lib/Repository/GitHub.php
@@ -127,7 +127,7 @@ public function authenticate(bool $required = true): bool
         $pem = 'file://' . $pem;
 
         $integrationId = config('cdash.github_app_id');
-        if (is_null($integrationId)) {
+        if (null === $integrationId) {
             if ($required) {
                 throw new Exception('GITHUB_APP_ID is not set');
             }
@@ -314,7 +314,7 @@ public function generateCheckPayloadFromBuildRows($build_rows, string $head_sha)
         $build_summaries = [];
         foreach ($build_rows as $row) {
             $build_summary = $this->getCheckSummaryForBuildRow($row);
-            if (!is_null($build_summary)) {
+            if (null !== $build_summary) {
                 $build_summaries[] = $build_summary;
             }
         }
@@ -558,7 +558,7 @@ public function compareCommits(BuildUpdate $update): bool
                     }
                 }
 
-                if (is_null($commit)) {
+                if (null === $commit) {
                     // Next, check the database.
                     $stmt = $this->db->prepare(
                         'SELECT DISTINCT revision FROM updatefile
@@ -571,13 +571,13 @@ public function compareCommits(BuildUpdate $update): bool
                                 break;
                             }
                         }
-                        if (!is_null($commit)) {
+                        if (null !== $commit) {
                             break;
                         }
                     }
                 }
 
-                if (is_null($commit)) {
+                if (null === $commit) {
                     // Lastly, use the Github API to find what files this commit changed.
                     // To avoid being rate-limited, we only perform this lookup once
                     // per commit, caching the results as we go.
@@ -613,14 +613,14 @@ public function compareCommits(BuildUpdate $update): bool
                                 break;
                             }
                         }
-                        if (!is_null($commit)) {
+                        if (null !== $commit) {
                             // Stop examining commits once we find one that matches.
                             break;
                         }
                     }
                 }
 
-                if (is_null($commit)) {
+                if (null === $commit) {
                     // Skip this file if we couldn't find a commit that modified it.
                     continue;
                 }
diff --git a/app/cdash/app/Model/Build.php b/app/cdash/app/Model/Build.php
index 19bf9b8889..130b88c398 100644
--- a/app/cdash/app/Model/Build.php
+++ b/app/cdash/app/Model/Build.php
@@ -188,7 +188,7 @@ public function SetSubProject($subproject): int|bool
         // Add this subproject as a label on the parent build.
         $this->SetParentId($this->LookupParentBuildId());
         if ($this->ParentId > 0) {
-            $parent = new Build();
+            $parent = new self();
             $parent->Id = $this->ParentId;
             $parent->AddLabel($label);
             $parent->InsertLabelAssociations();
@@ -267,7 +267,7 @@ public function SaveTotalTestsTime(): bool
         // to the parent's value.
         $this->SetParentId($this->LookupParentBuildId());
         if ($this->ParentId > 0) {
-            $parent = new Build();
+            $parent = new self();
             $parent->Id = $this->ParentId;
             $parent->UpdateBuildTestTime($total_proc_time);
         }
@@ -374,7 +374,7 @@ public function FillFromId($buildid): void
         $this->Filled = true;
     }
 
-    public static function MarshalResponseArray(Build $build, array $optional_values = []): array
+    public static function MarshalResponseArray(self $build, array $optional_values = []): array
     {
         $response = [
             'id' => $build->Id,
@@ -468,7 +468,7 @@ private function GetRelatedBuildId(
             $stmt = $this->PDO->prepare(
                 "SELECT id FROM build
                 $related_build_criteria
-                AND build.parentid = " . Build::PARENT_BUILD . "
+                AND build.parentid = " . self::PARENT_BUILD . "
                 AND build.id != :parentid
                 $which_build_criteria
                 LIMIT 1");
@@ -501,9 +501,9 @@ private function GetRelatedBuildId(
                 'AND subprojectid = :subprojectid';
             $values_to_bind['subprojectid'] = $this->SubProjectId;
         }
-        if ($this->ParentId === Build::PARENT_BUILD) {
+        if ($this->ParentId === self::PARENT_BUILD) {
             // Only search for other parents.
-            $parent_criteria = 'AND build.parentid = ' . Build::PARENT_BUILD;
+            $parent_criteria = 'AND build.parentid = ' . self::PARENT_BUILD;
         }
 
         $stmt = $this->PDO->prepare("
@@ -715,7 +715,7 @@ public function GetConfigures(): PDOStatement|false
                 return $stmt;
             }
         }
-        if (is_null($stmt)) {
+        if (null === $stmt) {
             $stmt = $this->PDO->prepare('
                 SELECT c.*, b.configureerrors, b.configurewarnings
                 FROM configure c
@@ -1533,7 +1533,7 @@ public function CreateParentBuild(int $numErrors, int $numWarnings): bool
         // This would be a standalone build with no subproject that matches
         // our name, site, stamp, and projectid.
         $existing_build = EloquentBuild::firstWhere([
-            'parentid' => Build::STANDALONE_BUILD,
+            'parentid' => self::STANDALONE_BUILD,
             'name' => $this->Name,
             'siteid' => $this->SiteId,
             'stamp' => $this->Stamp,
@@ -1545,13 +1545,13 @@ public function CreateParentBuild(int $numErrors, int $numWarnings): bool
             $this->SetParentId($existing_build->id);
 
             // Mark it as a parent (parentid of -1).
-            $existing_build->parentid = Build::PARENT_BUILD;
+            $existing_build->parentid = self::PARENT_BUILD;
             $existing_build->save();
         } else {
             // Otherwise create a new build to be the parent.
             $parent = clone $this;
             $parent->Id = null;
-            $parent->ParentId = Build::PARENT_BUILD;
+            $parent->ParentId = self::PARENT_BUILD;
             $parent->SubProjectId = null;
             $parent->SubProjectName = '';
             $parent->Uuid = '';
@@ -1565,7 +1565,7 @@ public function CreateParentBuild(int $numErrors, int $numWarnings): bool
         // Give the parent a label for this build's subproject.
         $label = new Label();
         $label->Text = $this->SubProjectName;
-        $parent = new Build();
+        $parent = new self();
         $parent->Id = $this->ParentId;
         $parent->AddLabel($label);
         $parent->InsertLabelAssociations();
@@ -1576,7 +1576,7 @@ public function CreateParentBuild(int $numErrors, int $numWarnings): bool
         // contain info about what subproject it came from.
         // TODO: maybe we don't need this any more?
         return EloquentBuild::where([
-            'parentid' => Build::STANDALONE_BUILD,
+            'parentid' => self::STANDALONE_BUILD,
             'siteid' => $this->SiteId,
             'name' => $this->Name,
             'stamp' => $this->Stamp,
@@ -2068,7 +2068,7 @@ public static function GetSubProjectBuild(int $parentid, int $subprojectid): ?se
             return null;
         }
 
-        $build = new Build();
+        $build = new self();
         $build->Id = $eloquent_model->id;
         $build->FillFromId($eloquent_model->id);
         return $build;
@@ -2212,7 +2212,7 @@ public function AddBuild(int $nbuilderrors = -1, int $nbuildwarnings = -1): bool
         } elseif ($this->ParentId > 0) {
             // If we just created a child build, associate it with
             // the parent's updates (if any).
-            BuildUpdate::AssignUpdateToChild(intval($this->Id), intval($this->ParentId));
+            BuildUpdate::AssignUpdateToChild((int) $this->Id, (int) $this->ParentId);
         }
 
         return true;
diff --git a/app/cdash/app/Model/BuildEmail.php b/app/cdash/app/Model/BuildEmail.php
index 1225d2e08a..446e4cc0b9 100644
--- a/app/cdash/app/Model/BuildEmail.php
+++ b/app/cdash/app/Model/BuildEmail.php
@@ -61,7 +61,7 @@ public static function GetEmailSentForBuild($buildId): BuildEmailCollection
         if ($build !== null) {
             /* @var \App\Models\BuildEmail $email */
             foreach ($build->emails as $sent_email) {
-                $email = new BuildEmail();
+                $email = new self();
                 $email
                     ->SetBuildId($buildId)
                     ->SetCategory($sent_email->category)
diff --git a/app/cdash/app/Model/BuildError.php b/app/cdash/app/Model/BuildError.php
index 74985fd132..10d20630c8 100644
--- a/app/cdash/app/Model/BuildError.php
+++ b/app/cdash/app/Model/BuildError.php
@@ -57,7 +57,7 @@ public function Insert(): void
         BasicBuildAlert::create([
             'buildid' => (int) $this->BuildId,
             'type' => $this->Type,
-            'logline' => intval($this->LogLine),
+            'logline' => (int) $this->LogLine,
             'text' => $this->Text,
             'sourcefile' => $this->SourceFile ?? '',
             'sourceline' => (int) $this->SourceLine,
diff --git a/app/cdash/app/Model/BuildFailure.php b/app/cdash/app/Model/BuildFailure.php
index 13b926735c..9c749c0561 100644
--- a/app/cdash/app/Model/BuildFailure.php
+++ b/app/cdash/app/Model/BuildFailure.php
@@ -106,11 +106,11 @@ public function Insert(): bool
                              SELECT id FROM buildfailuredetails WHERE crc32=?
                          ', [$crc32]);
         if ($detailsResult && array_key_exists('id', $detailsResult)) {
-            $detailsId = intval($detailsResult['id']);
+            $detailsId = (int) $detailsResult['id'];
         } else {
             $detailsId = DB::table('buildfailuredetails')
                 ->insertGetId([
-                    'type' => intval($this->Type),
+                    'type' => (int) $this->Type,
                     'stdoutput' => $stdOutput,
                     'stderror' => $stdError,
                     'exitcondition' => $exitCondition,
@@ -124,7 +124,7 @@ public function Insert(): bool
 
         $id = DB::table('buildfailure')
             ->insertGetId([
-                'buildid' => intval($this->BuildId),
+                'buildid' => (int) $this->BuildId,
                 'detailsid' => $detailsId,
                 'workingdirectory' => $workingDirectory,
                 'sourcefile' => $sourceFile,
@@ -147,7 +147,7 @@ public function Insert(): bool
             }
 
             if (!empty($query)) {
-                $argumentids[] = intval($query['id']);
+                $argumentids[] = (int) $query['id'];
             } else {
                 $argumentids[] = DB::table('buildfailureargument')->insertGetId([
                     'argument' => $argumentescaped,
@@ -161,8 +161,8 @@ public function Insert(): bool
         $i = 0;
         foreach ($argumentids as $argumentid) {
             $query .= '(?, ?, ?),';
-            $params[] = intval($id);
-            $params[] = intval($argumentid);
+            $params[] = (int) $id;
+            $params[] = (int) $argumentid;
             $params[] = $i;
             $i++;
         }
diff --git a/app/cdash/app/Model/BuildGroup.php b/app/cdash/app/Model/BuildGroup.php
index 626cb45436..7ed38b34d5 100644
--- a/app/cdash/app/Model/BuildGroup.php
+++ b/app/cdash/app/Model/BuildGroup.php
@@ -481,7 +481,7 @@ public static function GetBuildGroups($projectid, $begin): array
         ", [$projectid, $begin, $begin]);
 
         foreach ($stmt as $row) {
-            $buildgroup = new BuildGroup();
+            $buildgroup = new self();
             $buildgroup->SetId((int) $row->id);
             $buildgroup->SetName($row->name);
             // TODO: Clean this up.  Position is a *private* member...
diff --git a/app/cdash/app/Model/CoverageFileLog.php b/app/cdash/app/Model/CoverageFileLog.php
index c4f52f7b8b..d4a249e9a9 100644
--- a/app/cdash/app/Model/CoverageFileLog.php
+++ b/app/cdash/app/Model/CoverageFileLog.php
@@ -136,7 +136,7 @@ public function Load($for_update = false): bool
             }
             [$line, $value] = explode(':', $log_entry);
             if (is_numeric($line)) {
-                $lines_retrieved[] = intval($line);
+                $lines_retrieved[] = (int) $line;
             } else {
                 $lines_retrieved[] = $line;
             }
@@ -235,9 +235,9 @@ public function UpdateAggregate(): void
                                AND projectid=?
                                AND b.subprojectid=?
                        ', [
-                    intval($this->AggregateBuildId),
-                    intval($this->Build->ProjectId),
-                    intval($this->Build->SubProjectId),
+                    (int) $this->AggregateBuildId,
+                    (int) $this->Build->ProjectId,
+                    (int) $this->Build->SubProjectId,
                 ]);
                 if (!$row || !array_key_exists('id', $row)) {
                     // An aggregate build for this SubProject doesn't exist yet.
@@ -245,12 +245,12 @@ public function UpdateAggregate(): void
                     $aggregateBuild = create_aggregate_build($this->Build);
                     $aggregateBuildId = $aggregateBuild->Id;
                 } else {
-                    $aggregateBuildId = intval($row['id']);
+                    $aggregateBuildId = (int) $row['id'];
                 }
             } else {
                 // For standalone builds AggregateBuildId is exactly what we're
                 // looking for.
-                $aggregateBuildId = intval($this->AggregateBuildId);
+                $aggregateBuildId = (int) $this->AggregateBuildId;
             }
             $aggregateBuild = new Build();
             $aggregateBuild->Id = $aggregateBuildId;
@@ -273,7 +273,7 @@ public function UpdateAggregate(): void
                        cfl.buildid=?
                        AND cf.fullpath=?
                ', [$aggregateBuildId, $path]);
-        if ($row && array_key_exists('id', $row) && intval($row['id']) !== intval($this->FileId)) {
+        if ($row && array_key_exists('id', $row) && (int) $row['id'] !== (int) $this->FileId) {
             Log::info("Not appending coverage of '$path' to aggregate as it already contains a different version of this file.", [
                 'function' => 'CoverageFileLog::UpdateAggregate',
                 'buildid' => $this->BuildId,
diff --git a/app/cdash/app/Model/CoverageSummary.php b/app/cdash/app/Model/CoverageSummary.php
index 1c2801ff04..47bcfbc1b5 100644
--- a/app/cdash/app/Model/CoverageSummary.php
+++ b/app/cdash/app/Model/CoverageSummary.php
@@ -64,8 +64,8 @@ public function RemoveAll(): void
         }
 
         $build->coverageResults()->delete();
-        DB::delete('DELETE FROM coveragefilelog WHERE buildid=?', [intval($this->BuildId)]);
-        DB::delete('DELETE FROM coveragesummary WHERE buildid=?', [intval($this->BuildId)]);
+        DB::delete('DELETE FROM coveragefilelog WHERE buildid=?', [(int) $this->BuildId]);
+        DB::delete('DELETE FROM coveragesummary WHERE buildid=?', [(int) $this->BuildId]);
     }
 
     /** Insert a new summary */
@@ -96,7 +96,7 @@ public function Insert($append = false): bool
                                         FROM coveragefile AS cf
                                         INNER JOIN coveragefilelog AS cfl ON (cfl.fileid=cf.id)
                                         WHERE cf.fullpath=? AND cfl.buildid=?
-                                   ', [$fullpath, intval($this->BuildId)]);
+                                   ', [$fullpath, (int) $this->BuildId]);
                     if (empty($coveragefile)) {
                         // Create an empty file if doesn't exist.
                         $fileid = CoverageFile::create([
@@ -104,7 +104,7 @@ public function Insert($append = false): bool
                             'crc32' => 0,
                         ])->id;
                     } else {
-                        $fileid = intval($coveragefile['id']);
+                        $fileid = (int) $coveragefile['id'];
                     }
                     $coverage->CoverageFile->Id = $fileid;
                 }
@@ -294,21 +294,21 @@ public function ComputeDifference($previous_parentid = null): bool
                         SELECT loctested, locuntested, loctesteddiff, locuntesteddiff
                         FROM coveragesummary
                         WHERE buildid=?
-                    ', [intval($this->BuildId)]);
+                    ', [(int) $this->BuildId]);
         if (empty($coverage)) {
             return false;
         }
-        $loctested = intval($coverage['loctested']);
-        $locuntested = intval($coverage['locuntested']);
+        $loctested = (int) $coverage['loctested'];
+        $locuntested = (int) $coverage['locuntested'];
 
         $previouscoverage = $db->executePreparedSingleRow('
                                 SELECT loctested, locuntested
                                 FROM coveragesummary
                                 WHERE buildid=?
-                            ', [intval($previousBuildId)]);
+                            ', [(int) $previousBuildId]);
         if (!empty($previouscoverage)) {
-            $previousloctested = intval($previouscoverage['loctested']);
-            $previouslocuntested = intval($previouscoverage['locuntested']);
+            $previousloctested = (int) $previouscoverage['loctested'];
+            $previouslocuntested = (int) $previouscoverage['locuntested'];
 
             $loctesteddiff = $loctested - $previousloctested;
             $locuntesteddiff = $locuntested - $previouslocuntested;
@@ -322,7 +322,7 @@ public function ComputeDifference($previous_parentid = null): bool
             ', [
                 $loctesteddiff,
                 $locuntesteddiff,
-                intval($this->BuildId),
+                (int) $this->BuildId,
             ]);
         }
 
@@ -341,7 +341,7 @@ public function Exists(): bool
                              SELECT 1
                              FROM coveragesummary
                              WHERE buildid=?
-                         ', [intval($this->BuildId)]);
+                         ', [(int) $this->BuildId]);
 
         return !empty($exists_result);
     }
diff --git a/app/cdash/app/Model/DynamicAnalysis.php b/app/cdash/app/Model/DynamicAnalysis.php
index 5f6282317a..53d17427d0 100644
--- a/app/cdash/app/Model/DynamicAnalysis.php
+++ b/app/cdash/app/Model/DynamicAnalysis.php
@@ -214,7 +214,7 @@ private function GetRelatedId($build, $order, $time_clause = null): int
         if ($query === []) {
             return 0;
         }
-        return intval($query[0]->id);
+        return (int) $query[0]->id;
     }
 
     /** Get the previous id for this DA */
diff --git a/app/cdash/app/Model/Project.php b/app/cdash/app/Model/Project.php
index c555d523ed..a2819bdc3c 100644
--- a/app/cdash/app/Model/Project.php
+++ b/app/cdash/app/Model/Project.php
@@ -589,7 +589,7 @@ public function ConvertToJSON(): array
         $response['name_encoded'] = urlencode($this->Name ?? '');
 
         $user = Auth::user();
-        $includeQuota = !boolval(config('cdash.user_create_projects')) || ($user !== null && $user->admin);
+        $includeQuota = !(bool) config('cdash.user_create_projects') || ($user !== null && $user->admin);
 
         if ($includeQuota) {
             $uploadQuotaGB = 0;
diff --git a/app/cdash/app/Model/SubProject.php b/app/cdash/app/Model/SubProject.php
index f7724f9e49..255b6f5d8c 100644
--- a/app/cdash/app/Model/SubProject.php
+++ b/app/cdash/app/Model/SubProject.php
@@ -101,7 +101,7 @@ public function Delete($keephistory = true): void
 
         // Regardless of whether or not we're performing a "soft delete",
         // we should remove any dependencies on this subproject.
-        DB::delete('DELETE FROM subproject2subproject WHERE dependsonid=?', [intval($this->Id)]);
+        DB::delete('DELETE FROM subproject2subproject WHERE dependsonid=?', [(int) $this->Id]);
 
         if (!$keephistory) {
             Build::where('subprojectid', $this->Id)->update(['subprojectid' => null]);
@@ -359,7 +359,7 @@ public function CommonBuildQuery($startUTCdate, $endUTCdate, bool $allSubProject
                 b.starttime > ? AND
                 b.starttime <= ? AND
                 bg.includesubprojectotal = 1";
-        $params = array_merge($params, [intval($this->ProjectId), $startUTCdate, $endUTCdate]);
+        $params = array_merge($params, [(int) $this->ProjectId, $startUTCdate, $endUTCdate]);
         if ($allSubProjects) {
             $query .= ' GROUP BY subprojectid';
         }
@@ -373,7 +373,7 @@ public function CommonBuildQuery($startUTCdate, $endUTCdate, bool $allSubProject
         if ($allSubProjects) {
             $project_array = [];
             foreach ($project as $row) {
-                $project_array[intval($row['subprojectid'])] = $row;
+                $project_array[(int) $row['subprojectid']] = $row;
             }
             return $project_array;
         } else {
@@ -455,7 +455,7 @@ public function RemoveDependency(int $subprojectid): void
      *
      * TODO: Move this somewhere else...
      */
-    public static function GetSubProjectFromPath(string $path, int $projectid): ?SubProject
+    public static function GetSubProjectFromPath(string $path, int $projectid): ?self
     {
         $query = DB::select("
             SELECT id
@@ -474,7 +474,7 @@ public static function GetSubProjectFromPath(string $path, int $projectid): ?Sub
             ]);
             return null;
         }
-        $subproject = new SubProject();
+        $subproject = new self();
         $subproject->SetId((int) $query[0]->id);
         return $subproject;
     }
diff --git a/app/cdash/app/Model/Subscriber.php b/app/cdash/app/Model/Subscriber.php
index 3ac19bd0fe..a8ffa782fc 100644
--- a/app/cdash/app/Model/Subscriber.php
+++ b/app/cdash/app/Model/Subscriber.php
@@ -86,7 +86,7 @@ public function hasBuildTopics(ActionableBuildInterface $submission): bool
 
     public function getTopics(): TopicCollection
     {
-        if (is_null($this->topics)) {
+        if (null === $this->topics) {
             $this->topics = new TopicCollection();
         }
         return $this->topics;
diff --git a/app/cdash/include/Collection/BuildEmailCollection.php b/app/cdash/include/Collection/BuildEmailCollection.php
index 606d719003..b9e3804739 100644
--- a/app/cdash/include/Collection/BuildEmailCollection.php
+++ b/app/cdash/include/Collection/BuildEmailCollection.php
@@ -28,7 +28,7 @@ public function add(BuildEmail $buildEmail): static
     {
         $email = $buildEmail->GetEmail();
         if (in_array($email, $this->keys)) {
-            array_push($this->collection[$email], $buildEmail);
+            $this->collection[$email][] = $buildEmail;
         } else {
             $this->addItem([$buildEmail], $email);
         }
@@ -47,7 +47,7 @@ public function sortByCategory(): CollectionCollection
                     $sub = $collection->get($category);
                     $sub->add($email);
                 } else {
-                    $sub = new BuildEmailCollection();
+                    $sub = new self();
                     $sub->add($email);
                     $collection->addItem($sub, $category);
                 }
diff --git a/app/cdash/include/Collection/Collection.php b/app/cdash/include/Collection/Collection.php
index 866e754bdb..d3142cc448 100644
--- a/app/cdash/include/Collection/Collection.php
+++ b/app/cdash/include/Collection/Collection.php
@@ -90,7 +90,7 @@ public function valid(): bool
         // a call to key may result in null, e.g. !isset. To prevent endless loop in the event
         // that collection was set with a key equal to an empty string, we must check for the null
         // type here.
-        if (is_null($key)) {
+        if (null === $key) {
             return false;
         }
 
@@ -111,7 +111,7 @@ public function rewind(): void
     public function addItem($item, $name = null): self
     {
         $ptr = count($this->collection);
-        $key = is_null($name) ? $ptr : $name;
+        $key = null === $name ? $ptr : $name;
 
         if (!in_array($key, $this->keys) && !in_array($key, array_keys($this->collection))) {
             $this->keys[$ptr] = $key;
diff --git a/app/cdash/include/Messaging/Subscription/Subscription.php b/app/cdash/include/Messaging/Subscription/Subscription.php
index 70e7c4bbf7..8106821753 100644
--- a/app/cdash/include/Messaging/Subscription/Subscription.php
+++ b/app/cdash/include/Messaging/Subscription/Subscription.php
@@ -100,7 +100,7 @@ public function getTopicDescriptions($case = null): array
         $descriptions = [];
         foreach ($this->subscriber->getTopics() as $topic) {
             $description = $topic->getTopicDescription();
-            if (!is_null($case)) {
+            if (null !== $case) {
                 $description = $case === CASE_UPPER ? strtoupper($description) : strtolower($description);
             }
             $descriptions[] = $description;
@@ -169,11 +169,11 @@ public function getBuildSummary(): array
                         $summary['build_type'] = $build->Type;
                     }
 
-                    if (is_null($summary['build_parent_id'])) {
+                    if (null === $summary['build_parent_id']) {
                         $summary['build_parent_id'] = $build->GetParentId();
                     }
 
-                    if (is_null($summary['build_summary_url'])) {
+                    if (null === $summary['build_summary_url']) {
                         $id = (int) $summary['build_parent_id'] ?: $build->Id;
                         $summary['build_summary_url'] = url("/builds/{$id}");
                     }
diff --git a/app/cdash/include/Messaging/Subscription/UserSubscriptionBuilder.php b/app/cdash/include/Messaging/Subscription/UserSubscriptionBuilder.php
index d74b21b9e6..a5b1d7b6a0 100644
--- a/app/cdash/include/Messaging/Subscription/UserSubscriptionBuilder.php
+++ b/app/cdash/include/Messaging/Subscription/UserSubscriptionBuilder.php
@@ -52,7 +52,7 @@ public function build(SubscriptionCollection $subscriptions): void
      */
     protected function getSubscriptionFactory(): SubscriptionFactory
     {
-        if (is_null($this->subscriptionFactory)) {
+        if (null === $this->subscriptionFactory) {
             $this->subscriptionFactory = new SubscriptionFactory();
         }
         return $this->subscriptionFactory;
diff --git a/app/cdash/include/Messaging/Topic/DynamicAnalysisTopic.php b/app/cdash/include/Messaging/Topic/DynamicAnalysisTopic.php
index d6ca76f416..7dfefd5052 100644
--- a/app/cdash/include/Messaging/Topic/DynamicAnalysisTopic.php
+++ b/app/cdash/include/Messaging/Topic/DynamicAnalysisTopic.php
@@ -34,7 +34,7 @@ class DynamicAnalysisTopic extends Topic implements Decoratable
 
     public function subscribesToBuild(Build $build): bool
     {
-        $ancestorSubscribe = is_null($this->topic) ? true : $this->topic->subscribesToBuild($build);
+        $ancestorSubscribe = null === $this->topic ? true : $this->topic->subscribesToBuild($build);
         $collection = $build->GetDynamicAnalysisCollection();
         $subscribe = false;
         if ($ancestorSubscribe) {
diff --git a/app/cdash/include/Messaging/Topic/GroupMembershipTopic.php b/app/cdash/include/Messaging/Topic/GroupMembershipTopic.php
index 0d5dfd5e97..697a3cf400 100644
--- a/app/cdash/include/Messaging/Topic/GroupMembershipTopic.php
+++ b/app/cdash/include/Messaging/Topic/GroupMembershipTopic.php
@@ -13,7 +13,7 @@ class GroupMembershipTopic extends Topic
 
     public function subscribesToBuild(Build $build): bool
     {
-        $parentTopic = is_null($this->topic) ? true : $this->topic->subscribesToBuild($build);
+        $parentTopic = null === $this->topic ? true : $this->topic->subscribesToBuild($build);
         $subscribe = $parentTopic && $this->group === $build->GetBuildType();
         return $subscribe;
     }
diff --git a/app/cdash/include/Messaging/Topic/Topic.php b/app/cdash/include/Messaging/Topic/Topic.php
index 21555d5187..d74382e951 100644
--- a/app/cdash/include/Messaging/Topic/Topic.php
+++ b/app/cdash/include/Messaging/Topic/Topic.php
@@ -144,7 +144,7 @@ public function hasSubscriberAlreadyBeenNotified(Build $build, $category = null)
         $collection = $build->GetBuildEmailCollection();
         $address = $this->subscriber->getAddress();
 
-        if (!is_null($category)) {
+        if (null !== $category) {
             $collection = $collection
                 ->sortByCategory()
                 ->get($category);
diff --git a/app/cdash/include/Test/UseCase/TestUseCase.php b/app/cdash/include/Test/UseCase/TestUseCase.php
index 782024d47a..f923413f78 100644
--- a/app/cdash/include/Test/UseCase/TestUseCase.php
+++ b/app/cdash/include/Test/UseCase/TestUseCase.php
@@ -198,25 +198,25 @@ protected function createTest(array $properties): self
 
     public function createTestPassed(string $name, array $labels = []): self
     {
-        $this->createTest([$name, TestUseCase::PASSED, 'Labels' => $labels]);
+        $this->createTest([$name, self::PASSED, 'Labels' => $labels]);
         return $this;
     }
 
     public function createTestFailed(string $name, array $labels = []): self
     {
-        $this->createTest([$name, TestUseCase::FAILED, 'Labels' => $labels]);
+        $this->createTest([$name, self::FAILED, 'Labels' => $labels]);
         return $this;
     }
 
     public function createTestNotRun(string $name, array $labels = []): self
     {
-        $this->createTest([$name, TestUseCase::NOTRUN, 'Labels' => $labels]);
+        $this->createTest([$name, self::NOTRUN, 'Labels' => $labels]);
         return $this;
     }
 
     public function createTestTimedout(string $name, array $labels = []): self
     {
-        $this->createTest([$name, TestUseCase::TIMEOUT, 'Labels' => $labels]);
+        $this->createTest([$name, self::TIMEOUT, 'Labels' => $labels]);
         return $this;
     }
 }
diff --git a/app/cdash/include/common.php b/app/cdash/include/common.php
index eb44494ec9..3c790d3f44 100644
--- a/app/cdash/include/common.php
+++ b/app/cdash/include/common.php
@@ -392,7 +392,7 @@ function get_project_id($projectname): int
     $project = $service->get(Project::class);
     $project->Name = $projectname;
     if ($project->GetIdByName()) {
-        return intval($project->Id);
+        return (int) $project->Id;
     }
     return -1;
 }
@@ -407,7 +407,7 @@ function get_project_name($projectid): string
     }
 
     $db = Database::getInstance();
-    $project = $db->executePreparedSingleRow('SELECT name FROM project WHERE id=?', [intval($projectid)]);
+    $project = $db->executePreparedSingleRow('SELECT name FROM project WHERE id=?', [(int) $projectid]);
     if (!empty($project)) {
         return $project['name'];
     }
@@ -423,7 +423,7 @@ function remove_project_builds($projectid): void
         return;
     }
 
-    $build = DB::select('SELECT id FROM build WHERE projectid=?', [intval($projectid)]);
+    $build = DB::select('SELECT id FROM build WHERE projectid=?', [(int) $projectid]);
 
     $buildids = [];
     foreach ($build as $build_array) {
@@ -467,9 +467,9 @@ function get_dates($date, $nightlytime): array
     $date = date(FMT_DATE, strtotime($date));
 
     $nightlytime = strtotime($nightlytime, strtotime($date));
-    $nightlyhour = intval(date('H', $nightlytime));
-    $nightlyminute = intval(date('i', $nightlytime));
-    $nightlysecond = intval(date('s', $nightlytime));
+    $nightlyhour = (int) date('H', $nightlytime);
+    $nightlyminute = (int) date('i', $nightlytime);
+    $nightlysecond = (int) date('s', $nightlytime);
 
     if (strlen($date) === 0) {
         $date = date(FMT_DATE); // the date is always the date of the server
@@ -484,14 +484,14 @@ function get_dates($date, $nightlytime): array
         }
     }
 
-    $today = mktime($nightlyhour, $nightlyminute, $nightlysecond, intval(date2month($date)), intval(date2day($date)), intval(date2year($date))) - 3600 * 24; // starting time
+    $today = mktime($nightlyhour, $nightlyminute, $nightlysecond, (int) date2month($date), (int) date2day($date), (int) date2year($date)) - 3600 * 24; // starting time
 
     // If the $nightlytime is in the morning it's actually the day after
     if (date(FMT_TIME, $nightlytime) < '12:00:00') {
         $date = date(FMT_DATE, strtotime($date) - 3600 * 24); // previous date
     }
 
-    $todaydate = mktime(0, 0, 0, intval(date2month($date)), intval(date2day($date)), intval(date2year($date)));
+    $todaydate = mktime(0, 0, 0, (int) date2month($date), (int) date2day($date), (int) date2year($date));
     $previousdate = date(FMT_DATE, $todaydate - 3600 * 24);
     $nextdate = date(FMT_DATE, $todaydate + 3600 * 24);
     return [$previousdate, $today, $nextdate, $date];
@@ -582,7 +582,7 @@ function get_dashboard_JSON($projectname, $date, &$response): void
     $project_array['name'] = $projectname;
     $project_array['nightlytime'] = $project->Id ? $project->NightlyTime : '00:00:00';
 
-    if (is_null($date)) {
+    if (null === $date) {
         $date = date(FMT_DATE);
     }
     [$previousdate, $currentstarttime, $nextdate] = get_dates($date, $project_array['nightlytime']);
@@ -699,7 +699,7 @@ function cast_data_for_JSON($value)
     }
     // Do not support E notation for numbers (ie 6.02e23).
     // This can cause checksums (such as git commits) to be converted to 0.
-    if (is_numeric($value) && stripos($value, 'e') === false) {
+    if (is_numeric($value) && !str_contains(strtolower($value), strtolower('e'))) {
         if (is_nan($value) || is_infinite($value)) {
             // Special handling for values that are not supported by JSON.
             return 0;
@@ -747,7 +747,7 @@ function get_aggregate_build(Build $build): Build
     $subproj_where_params = [];
     if ($build->SubProjectId) {
         $subproj_where = 'AND subprojectid=?';
-        $subproj_where_params[] = intval($build->SubProjectId);
+        $subproj_where_params[] = (int) $build->SubProjectId;
     }
 
     $db = Database::getInstance();
@@ -765,8 +765,8 @@ function get_aggregate_build(Build $build): Build
                    AND starttime >= ?
                $subproj_where
            ", array_merge([
-        intval($siteid),
-        intval($build->ProjectId),
+        (int) $siteid,
+        (int) $build->ProjectId,
         $build->EndOfDay,
         $build->BeginningOfDay],
         $subproj_where_params
@@ -785,7 +785,7 @@ function get_aggregate_build(Build $build): Build
 
 function create_aggregate_build($build, $siteid = null): Build
 {
-    if (is_null($siteid)) {
+    if (null === $siteid) {
         $siteid = get_server_siteid();
     }
 
diff --git a/app/cdash/include/filterdataFunctions.php b/app/cdash/include/filterdataFunctions.php
index c7b2b5082f..2f069e145b 100644
--- a/app/cdash/include/filterdataFunctions.php
+++ b/app/cdash/include/filterdataFunctions.php
@@ -1023,10 +1023,10 @@ function get_filterdata_from_request($page_id = ''): array
     $pageSpecificFilters = createPageSpecificFilters($page_id);
     $filterdata['pageSpecificFilters'] = $pageSpecificFilters;
 
-    $filtercount = intval($_GET['filtercount'] ?? 0);
-    $showfilters = intval($_GET['showfilters'] ?? 0);
-    $showlimit = intval($_GET['showlimit'] ?? 0);
-    $limit = intval($_GET['limit'] ?? 0);
+    $filtercount = (int) ($_GET['filtercount'] ?? 0);
+    $showfilters = (int) ($_GET['showfilters'] ?? 0);
+    $showlimit = (int) ($_GET['showlimit'] ?? 0);
+    $limit = (int) ($_GET['limit'] ?? 0);
 
     $clear = $_GET['clear'] ?? '';
     if ($clear === 'Clear') {
@@ -1085,7 +1085,7 @@ function get_filterdata_from_request($page_id = ''): array
     }
 
     if (array_key_exists('colorblind', $_COOKIE)) {
-        $filterdata['colorblind'] = intval($_COOKIE['colorblind']);
+        $filterdata['colorblind'] = (int) $_COOKIE['colorblind'];
     } else {
         if (get_css_file() === 'assets/css/colorblind.css') {
             $filterdata['colorblind'] = 1;
diff --git a/app/cdash/tests/kwtest/kw_test_manager.php b/app/cdash/tests/kwtest/kw_test_manager.php
index ca753c0a8c..2094e7da5b 100644
--- a/app/cdash/tests/kwtest/kw_test_manager.php
+++ b/app/cdash/tests/kwtest/kw_test_manager.php
@@ -17,11 +17,11 @@
 
 use Illuminate\Support\Facades\Artisan;
 
-require_once dirname(__FILE__) . '/simpletest/unit_tester.php';
-require_once dirname(__FILE__) . '/simpletest/mock_objects.php';
-require_once dirname(__FILE__) . '/simpletest/web_tester.php';
-require_once dirname(__FILE__) . '/kw_db.php';
-require_once dirname(__FILE__) . '/kw_unlink.php';
+require_once __DIR__ . '/simpletest/unit_tester.php';
+require_once __DIR__ . '/simpletest/mock_objects.php';
+require_once __DIR__ . '/simpletest/web_tester.php';
+require_once __DIR__ . '/kw_db.php';
+require_once __DIR__ . '/kw_unlink.php';
 
 /**
  * The test manager interface kw tests with simpletest test.
diff --git a/app/cdash/tests/kwtest/kw_web_tester.php b/app/cdash/tests/kwtest/kw_web_tester.php
index 240dfa9368..3e15aed0f8 100644
--- a/app/cdash/tests/kwtest/kw_web_tester.php
+++ b/app/cdash/tests/kwtest/kw_web_tester.php
@@ -15,8 +15,8 @@
   PURPOSE. See the above copyright notices for more information.
 =========================================================================*/
 
-require_once dirname(__FILE__) . '/../../../../vendor/autoload.php';
-require_once dirname(__FILE__) . '/kw_unlink.php';
+require_once __DIR__ . '/../../../../vendor/autoload.php';
+require_once __DIR__ . '/kw_unlink.php';
 
 // This is used by several of the tests, but the Laravel entrypoint is not used for
 // such tests, meaning that this could be undefined.
@@ -334,7 +334,7 @@ public function submission_assign_buildid($file, $project, $build, $site,
         $stamp, $subproject = null, $header = null)
     {
         $url = $this->url . "/submit.php?project=$project&build=$build&site=$site&stamp=$stamp";
-        if (!is_null($subproject)) {
+        if (null !== $subproject) {
             $url .= "&subproject=$subproject";
         }
 
@@ -378,7 +378,7 @@ public function uploadfile($url, $filename, $header = null)
         curl_setopt($ch, CURLOPT_INFILE, $fp);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_INFILESIZE, filesize($filename));
-        if (!is_null($header)) {
+        if (null !== $header) {
             curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
         }
         curl_setopt($ch, CURLOPT_HEADER, true);
diff --git a/app/cdash/tests/sameImage.php b/app/cdash/tests/sameImage.php
index 9ee78fffcd..22ecaa7559 100644
--- a/app/cdash/tests/sameImage.php
+++ b/app/cdash/tests/sameImage.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class EmailTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/simple.php b/app/cdash/tests/simple.php
index c49a19d4e6..9b9bf9b111 100644
--- a/app/cdash/tests/simple.php
+++ b/app/cdash/tests/simple.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class EmailTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/simple2.php b/app/cdash/tests/simple2.php
index c49a19d4e6..9b9bf9b111 100644
--- a/app/cdash/tests/simple2.php
+++ b/app/cdash/tests/simple2.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class EmailTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/singletest.php b/app/cdash/tests/singletest.php
index 165481498c..3e93e3109f 100644
--- a/app/cdash/tests/singletest.php
+++ b/app/cdash/tests/singletest.php
@@ -5,12 +5,12 @@
 // relative to the top of the CDash source tree
 //
 
-require_once dirname(__FILE__) . '/../../../vendor/autoload.php';
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/../../../vendor/autoload.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 require_once 'tests/kwtest/kw_test_manager.php';
 
-$env_contents = file_get_contents(dirname(__FILE__) . '/../../../.env');
+$env_contents = file_get_contents(__DIR__ . '/../../../.env');
 if (!str_contains($env_contents, 'DB_DATABASE=cdash4simpletest')) {
     echo "We cannot test cdash because test database is not cdash4simpletest\n";
     exit(1);
diff --git a/app/cdash/tests/test_actualbranchcoverage.php b/app/cdash/tests/test_actualbranchcoverage.php
index a12cd664e1..99a35c1033 100644
--- a/app/cdash/tests/test_actualbranchcoverage.php
+++ b/app/cdash/tests/test_actualbranchcoverage.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 require_once 'tests/test_branchcoverage.php';
 
 class ActualBranchCoverageTestCase extends BranchCoverageTestCase
diff --git a/app/cdash/tests/test_actualtrilinossubmission.php b/app/cdash/tests/test_actualtrilinossubmission.php
index 411404fae7..ef06c5f814 100644
--- a/app/cdash/tests/test_actualtrilinossubmission.php
+++ b/app/cdash/tests/test_actualtrilinossubmission.php
@@ -6,7 +6,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 require_once 'tests/trilinos_submission_test.php';
 
 class ActualTrilinosSubmissionTestCase extends TrilinosSubmissionTestCase
diff --git a/app/cdash/tests/test_aggregatecoverage.php b/app/cdash/tests/test_aggregatecoverage.php
index 081120766b..0835c1e499 100644
--- a/app/cdash/tests/test_aggregatecoverage.php
+++ b/app/cdash/tests/test_aggregatecoverage.php
@@ -19,7 +19,7 @@
 //
 use Illuminate\Support\Facades\DB;
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class AggregateCoverageTestCase extends KWWebTestCase
 {
@@ -156,7 +156,7 @@ public function checkCoverage($coverage, $expected_loctested,
     public function submitTestingFile($filename)
     {
         $file_to_submit =
-            dirname(__FILE__) . '/data/AggregateCoverage/' . $filename;
+            __DIR__ . '/data/AggregateCoverage/' . $filename;
         return $this->submission('InsightExample', $file_to_submit);
     }
 }
diff --git a/app/cdash/tests/test_aggregatesubprojectcoverage.php b/app/cdash/tests/test_aggregatesubprojectcoverage.php
index 02317aa4ae..4981dbb82b 100644
--- a/app/cdash/tests/test_aggregatesubprojectcoverage.php
+++ b/app/cdash/tests/test_aggregatesubprojectcoverage.php
@@ -23,7 +23,7 @@ public function __construct()
     {
         parent::__construct();
         $this->deleteLog($this->logfilename);
-        $this->DataDir = dirname(__FILE__) . '/data/AggregateSubProjectCoverage';
+        $this->DataDir = __DIR__ . '/data/AggregateSubProjectCoverage';
     }
 
     public function testSubmitCoverage()
diff --git a/app/cdash/tests/test_attachedfiles.php b/app/cdash/tests/test_attachedfiles.php
index 49a04ba033..2b95f0f4a6 100644
--- a/app/cdash/tests/test_attachedfiles.php
+++ b/app/cdash/tests/test_attachedfiles.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Database;
 use CDash\Model\Project;
@@ -35,7 +35,7 @@ public function testAttachedFiles(): void
         $this->project->Fill();
 
         // Submit our testing data.
-        $this->submission('AttachedFiles', dirname(__FILE__) . '/data/AttachedFileTest.xml');
+        $this->submission('AttachedFiles', __DIR__ . '/data/AttachedFileTest.xml');
 
         // Get the buildtest we created.
         $db = Database::getInstance();
diff --git a/app/cdash/tests/test_authtoken.php b/app/cdash/tests/test_authtoken.php
index 1664f9e1ae..35d5153d4d 100644
--- a/app/cdash/tests/test_authtoken.php
+++ b/app/cdash/tests/test_authtoken.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Models\AuthToken;
 use App\Models\Project as EloquentProject;
@@ -151,7 +151,7 @@ public function testSubmissionWorksWithToken(): void
 
     public function normalSubmit($headers)
     {
-        $file = dirname(__FILE__) . '/data/InsightExperimentalExample/Insight_Experimental_Build.xml';
+        $file = __DIR__ . '/data/InsightExperimentalExample/Insight_Experimental_Build.xml';
         $url = "{$this->url}/submit.php?project=AuthTokenProject";
         $result = $this->uploadfile($url, $file, $headers);
         if (!$result || !str_contains($result, '<status>OK</status>')) {
@@ -196,7 +196,7 @@ public function postSubmit($token)
 
     public function putSubmit($headers)
     {
-        $file = dirname(__FILE__) . '/data/gcov.tar';
+        $file = __DIR__ . '/data/gcov.tar';
         $puturl = $this->url . "/submit.php?type=GcovTar&md5=5454e16948a1d58d897e174b75cc5633&filename=gcov.tar&buildid={$this->PostBuildId}";
         $put_result = $this->uploadfile($puturl, $file, $headers);
         if (!str_contains($put_result, '{"status":0}')) {
diff --git a/app/cdash/tests/test_bazeljson.php b/app/cdash/tests/test_bazeljson.php
index c0c8e99b07..59eed13f6d 100644
--- a/app/cdash/tests/test_bazeljson.php
+++ b/app/cdash/tests/test_bazeljson.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Utils\DatabaseCleanupUtils;
 use CDash\Database;
@@ -23,7 +23,7 @@ public function testBazelJSON()
         // Submit testing data.
         $buildid = $this->submit_data('InsightExample', 'BazelJSON',
             '0a9b0aeeb73618cd10d6e1bee221fd71',
-            dirname(__FILE__) . '/data/Bazel/bazel_BEP.json');
+            __DIR__ . '/data/Bazel/bazel_BEP.json');
         if (!$buildid) {
             return false;
         }
@@ -73,7 +73,7 @@ public function testBazelJSON()
         // Submit the same data again to verify that no testdiff is recorded.
         $buildid2 = $this->submit_data('InsightExample', 'BazelJSON',
             '0a9b0aeeb73618cd10d6e1bee221fd71',
-            dirname(__FILE__) . '/data/Bazel/bazel_BEP.json',
+            __DIR__ . '/data/Bazel/bazel_BEP.json',
             '20170824-1835-Experimental', '1503599755');
         $this->assertTrue($buildid2 > 1);
         $testdiff_stmt = $this->PDO->prepare(
@@ -105,7 +105,7 @@ public function testFilterBazelJSON()
         // Submit testing data.
         $buildid = $this->submit_data('Bazel', 'BazelJSON',
             '0a9b0aeeb73618cd10d6e1bee221fd71',
-            dirname(__FILE__) . '/data/Bazel/bazel_BEP.json');
+            __DIR__ . '/data/Bazel/bazel_BEP.json');
         if (!$buildid) {
             return false;
         }
@@ -155,7 +155,7 @@ public function testBazelSubProjs()
         // Setup subprojects.
         $parentid = $this->submit_data('BazelSubProj', 'SubProjectDirectories',
             '9e909746b706562eb263262a1496f202',
-            dirname(__FILE__) . '/data/Bazel/subproj/subproj_list.txt');
+            __DIR__ . '/data/Bazel/subproj/subproj_list.txt');
         if (!$parentid) {
             return false;
         }
@@ -163,14 +163,14 @@ public function testBazelSubProjs()
         // Submit build and test data.
         $parentid2 = $this->submit_data('BazelSubProj', 'BazelJSON',
             'a860786f23529d62472ba363525cd2f3',
-            dirname(__FILE__) . '/data/Bazel/subproj/subproj_build.json');
+            __DIR__ . '/data/Bazel/subproj/subproj_build.json');
         if (!$parentid2 || $parentid !== $parentid2) {
             $this->fail("parentid mismatch $parentid vs $parentid2");
             return false;
         }
         $parentid3 = $this->submit_data('BazelSubProj', 'BazelJSON',
             'c261e5014fddb72b372b85449be3301e',
-            dirname(__FILE__) . '/data/Bazel/subproj/subproj_test.json');
+            __DIR__ . '/data/Bazel/subproj/subproj_test.json');
         if (!$parentid3 || $parentid !== $parentid3) {
             $this->fail("parentid mismatch $parentid vs $parentid3");
             return false;
@@ -251,7 +251,7 @@ public function testBazelTestFailed()
         // Submit testing data.
         $buildid = $this->submit_data('InsightExample', 'BazelJSON',
             'abc62be615c3f2a469fe6b6ada556b75',
-            dirname(__FILE__) . '/data/Bazel/bazel_testFailed.json');
+            __DIR__ . '/data/Bazel/bazel_testFailed.json');
         if (!$buildid) {
             return false;
         }
@@ -307,7 +307,7 @@ public function testBazelTimeout()
         // Submit testing data.
         $buildid = $this->submit_data('InsightExample', 'BazelJSON',
             '73817c7f786ff65ce14af7c34a6850ba',
-            dirname(__FILE__) . '/data/Bazel/bazel_timeout.json');
+            __DIR__ . '/data/Bazel/bazel_timeout.json');
         if (!$buildid) {
             return false;
         }
@@ -363,7 +363,7 @@ public function testBazelConfigure()
         // Submit testing data.
         $buildid = $this->submit_data('InsightExample', 'BazelJSON',
             'e2b864cc0c5308148aea0d143df6d2ba',
-            dirname(__FILE__) . '/data/Bazel/bazel_configure.json');
+            __DIR__ . '/data/Bazel/bazel_configure.json');
         if (!$buildid) {
             return false;
         }
@@ -399,7 +399,7 @@ public function testBazelDuplicateTests()
         // Submit testing data.
         $buildid = $this->submit_data('InsightExample', 'BazelJSON',
             '4a42c09a1751848dc5b806c4bc701fd6',
-            dirname(__FILE__) . '/data/Bazel/automotive_test.json');
+            __DIR__ . '/data/Bazel/automotive_test.json');
         if (!$buildid) {
             return false;
         }
@@ -435,7 +435,7 @@ public function testMultipleLineError()
         // Submit testing data.
         $buildid = $this->submit_data('InsightExample', 'BazelJSON',
             '131eabf91e183359d4b3e1ef24482741',
-            dirname(__FILE__) . '/data/Bazel/bazel_multiple_line_error.json');
+            __DIR__ . '/data/Bazel/bazel_multiple_line_error.json');
         if (!$buildid) {
             return false;
         }
@@ -480,7 +480,7 @@ public function testShardTest()
         // Submit testing data.
         $buildid = $this->submit_data('InsightExample', 'BazelJSON',
             'cb99fa74feaf55a6777f3087becbce04',
-            dirname(__FILE__) . '/data/Bazel/bazel_shard_test.json');
+            __DIR__ . '/data/Bazel/bazel_shard_test.json');
         if (!$buildid) {
             return false;
         }
@@ -535,7 +535,7 @@ public function testShardTestFailures()
         // Submit testing data.
         $buildid = $this->submit_data('InsightExample', 'BazelJSON',
             '74df5d4af1b22097caf2304b301fe4d0',
-            dirname(__FILE__) . '/data/Bazel/bazel_shard_test_failures.json');
+            __DIR__ . '/data/Bazel/bazel_shard_test_failures.json');
         if (!$buildid) {
             return false;
         }
@@ -630,7 +630,7 @@ public function testShardTestTimeout()
         // Submit testing data.
         $buildid = $this->submit_data('InsightExample', 'BazelJSON',
             'aa689b38ea361e5ccdc6b59755fbec64',
-            dirname(__FILE__) . '/data/Bazel/bazel_shard_test_timeout.json');
+            __DIR__ . '/data/Bazel/bazel_shard_test_timeout.json');
         if (!$buildid) {
             return false;
         }
diff --git a/app/cdash/tests/test_branchcoverage.php b/app/cdash/tests/test_branchcoverage.php
index 9d80dc7065..1c0ed96850 100644
--- a/app/cdash/tests/test_branchcoverage.php
+++ b/app/cdash/tests/test_branchcoverage.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Models\PendingSubmissions;
 use App\Utils\DatabaseCleanupUtils;
@@ -99,7 +99,7 @@ protected function putSubmit($token = null)
     {
         // Do the PUT submission to actually upload our data.
         $puturl = $this->url . "/submit.php?type=GcovTar&md5=5454e16948a1d58d897e174b75cc5633&filename=gcov.tar&buildid={$this->buildid}";
-        $filename = dirname(__FILE__) . '/data/gcov.tar';
+        $filename = __DIR__ . '/data/gcov.tar';
         $headers = [];
         if ($token) {
             $headers = ["Authorization: Bearer {$token}"];
diff --git a/app/cdash/tests/test_buildconfigure.php b/app/cdash/tests/test_buildconfigure.php
index fee30c82b3..140d8149ea 100644
--- a/app/cdash/tests/test_buildconfigure.php
+++ b/app/cdash/tests/test_buildconfigure.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Utils\DatabaseCleanupUtils;
 use CDash\Database;
diff --git a/app/cdash/tests/test_builddetails.php b/app/cdash/tests/test_builddetails.php
index 39bdc102ef..43188abf8c 100644
--- a/app/cdash/tests/test_builddetails.php
+++ b/app/cdash/tests/test_builddetails.php
@@ -7,7 +7,7 @@
 use App\Utils\DatabaseCleanupUtils;
 use Illuminate\Support\Facades\DB;
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class BuildDetailsTestCase extends KWWebTestCase
 {
@@ -19,7 +19,7 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->testDataDir = dirname(__FILE__) . '/data/BuildDetails';
+        $this->testDataDir = __DIR__ . '/data/BuildDetails';
         $this->testDataFiles = ['Subbuild1.xml', 'Subbuild2.xml', 'Subbuild3.xml'];
 
         $this->createProject([
diff --git a/app/cdash/tests/test_buildfailuredetails.php b/app/cdash/tests/test_buildfailuredetails.php
index a314257f3c..c1ead79ce0 100644
--- a/app/cdash/tests/test_buildfailuredetails.php
+++ b/app/cdash/tests/test_buildfailuredetails.php
@@ -7,7 +7,7 @@
 use App\Utils\DatabaseCleanupUtils;
 use Illuminate\Support\Facades\DB;
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class BuildFailureDetailsTestCase extends KWWebTestCase
 {
@@ -24,7 +24,7 @@ public function testBuildFailureDetails()
         echo "1. testBuildFailureDetails\n";
 
         // Submit our test data.
-        $rep = dirname(__FILE__) . '/data/BuildFailureDetails';
+        $rep = __DIR__ . '/data/BuildFailureDetails';
         if (!$this->submission('EmailProjectExample', "$rep/Build_1.xml")) {
             $this->fail('failed to submit Build_1.xml');
             return 1;
diff --git a/app/cdash/tests/test_buildgetdate.php b/app/cdash/tests/test_buildgetdate.php
index b439f81de9..5d3a9dcd40 100644
--- a/app/cdash/tests/test_buildgetdate.php
+++ b/app/cdash/tests/test_buildgetdate.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Model\Build;
 
diff --git a/app/cdash/tests/test_buildgrouprule.php b/app/cdash/tests/test_buildgrouprule.php
index b6518b1c1f..e6e6298a33 100644
--- a/app/cdash/tests/test_buildgrouprule.php
+++ b/app/cdash/tests/test_buildgrouprule.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Utils\DatabaseCleanupUtils;
 use App\Utils\SubmissionUtils;
diff --git a/app/cdash/tests/test_buildmodel.php b/app/cdash/tests/test_buildmodel.php
index e7e889182d..db982609f1 100644
--- a/app/cdash/tests/test_buildmodel.php
+++ b/app/cdash/tests/test_buildmodel.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Models\Project;
 use App\Utils\DatabaseCleanupUtils;
@@ -26,7 +26,7 @@ public function __construct()
 
         $this->deleteLog($this->logfilename);
 
-        $this->testDataDir = dirname(__FILE__) . '/data/BuildModel';
+        $this->testDataDir = __DIR__ . '/data/BuildModel';
         $this->testDataFiles = ['build1.xml', 'build2.xml', 'build3.xml', 'build4.xml',
             'build5.xml', 'configure1.xml'];
 
diff --git a/app/cdash/tests/test_buildoverview.php b/app/cdash/tests/test_buildoverview.php
index 98d166327b..565e3f05d2 100644
--- a/app/cdash/tests/test_buildoverview.php
+++ b/app/cdash/tests/test_buildoverview.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class BuildOverviewTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/test_buildproperties.php b/app/cdash/tests/test_buildproperties.php
index 9fd58c0970..8e17299e2f 100644
--- a/app/cdash/tests/test_buildproperties.php
+++ b/app/cdash/tests/test_buildproperties.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Models\Project;
 use App\Utils\TestCreator;
@@ -215,7 +215,7 @@ private function create_build($buildname, $filename, $date, $md5): void
 
         // Do the PUT submission.
         $puturl = $this->url . "/submit.php?type=BuildPropertiesJSON&md5=$md5&filename=$filename&buildid=$build->Id";
-        $filepath = dirname(__FILE__) . "/data/BuildProperties/$filename";
+        $filepath = __DIR__ . "/data/BuildProperties/$filename";
         if (!$this->uploadfile($puturl, $filepath)) {
             $this->fail("PUT submit failed for $buildname");
         }
diff --git a/app/cdash/tests/test_buildrelationship.php b/app/cdash/tests/test_buildrelationship.php
index 749baae34c..9f98c67424 100644
--- a/app/cdash/tests/test_buildrelationship.php
+++ b/app/cdash/tests/test_buildrelationship.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Utils\DatabaseCleanupUtils;
 use App\Utils\SubmissionUtils;
diff --git a/app/cdash/tests/test_changeid.php b/app/cdash/tests/test_changeid.php
index 0f3a40b754..12dfd993b4 100644
--- a/app/cdash/tests/test_changeid.php
+++ b/app/cdash/tests/test_changeid.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 use CDash\Database;
 use Tests\Traits\CreatesProjects;
 
@@ -26,7 +26,7 @@ public function testChangeId(): void
         ]);
 
         // Submit our testing data.
-        $dir = dirname(__FILE__) . '/data/GithubPR';
+        $dir = __DIR__ . '/data/GithubPR';
         $this->submission($project->name, "$dir/UpdateBug_Build.xml");
         $this->submission($project->name, "$dir/UpdateBug_Test.xml");
         $this->submission($project->name, "$dir/Update.xml");
diff --git a/app/cdash/tests/test_commitauthornotification.php b/app/cdash/tests/test_commitauthornotification.php
index 957351dc32..f884b57182 100644
--- a/app/cdash/tests/test_commitauthornotification.php
+++ b/app/cdash/tests/test_commitauthornotification.php
@@ -12,7 +12,7 @@ class CommitAuthorNotificationTestCase extends KWWebTestCase
     public function __construct()
     {
         parent::__construct();
-        $this->dataDir = dirname(__FILE__) . "/data/{$this->projectName}";
+        $this->dataDir = __DIR__ . "/data/{$this->projectName}";
         $this->projectId = $this->createProject([
             'Name' => $this->projectName,
             'Description' => "Project {$this->projectName} test for cdash testing",
diff --git a/app/cdash/tests/test_committerinfo.php b/app/cdash/tests/test_committerinfo.php
index f3b4a007af..cf4fa9aa93 100644
--- a/app/cdash/tests/test_committerinfo.php
+++ b/app/cdash/tests/test_committerinfo.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class CommitterInfoTestCase extends KWWebTestCase
 {
@@ -15,7 +15,7 @@ public function __construct()
 
     public function testCommitterInfo(): void
     {
-        $file = dirname(__FILE__) . '/data/git-Update2.xml';
+        $file = __DIR__ . '/data/git-Update2.xml';
         if (!$this->submission('TestCompressionExample', $file)) {
             return;
         }
diff --git a/app/cdash/tests/test_compressedtest.php b/app/cdash/tests/test_compressedtest.php
index 431b784d26..7cbd0bdc1d 100644
--- a/app/cdash/tests/test_compressedtest.php
+++ b/app/cdash/tests/test_compressedtest.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class CompressedTestCase extends KWWebTestCase
 {
@@ -27,14 +27,14 @@ public function testSubmissionCompressedTest(): void
         $this->createProject($settings);
 
         // Make sure we can submit to it.
-        $file = dirname(__FILE__) . '/data/CompressedTest.xml';
+        $file = __DIR__ . '/data/CompressedTest.xml';
         $this->submission('TestCompressionExample', $file);
     }
 
     public function testGITUpdate(): void
     {
         echo "4. testGITUpdate\n";
-        $file = dirname(__FILE__) . '/data/git-Update.xml';
+        $file = __DIR__ . '/data/git-Update.xml';
         if (!$this->submission('TestCompressionExample', $file)) {
             return;
         }
diff --git a/app/cdash/tests/test_configureappend.php b/app/cdash/tests/test_configureappend.php
index e0d7d3e990..f709021ce6 100644
--- a/app/cdash/tests/test_configureappend.php
+++ b/app/cdash/tests/test_configureappend.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Models\Build;
 use App\Models\Configure;
@@ -37,7 +37,7 @@ public function testConfigureAppend(): void
         $this->project->Fill();
 
         // Submit our testing data.
-        $test_dir = dirname(__FILE__) . '/data/ConfigureAppend/';
+        $test_dir = __DIR__ . '/data/ConfigureAppend/';
         $files = ['Configure_1.xml', 'Configure_2.xml'];
         foreach ($files as $file) {
             if (!$this->submission('ConfigureAppend', "{$test_dir}/{$file}")) {
diff --git a/app/cdash/tests/test_configurewarnings.php b/app/cdash/tests/test_configurewarnings.php
index 2bf2b4e1cb..b545635831 100644
--- a/app/cdash/tests/test_configurewarnings.php
+++ b/app/cdash/tests/test_configurewarnings.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Database;
 use CDash\Model\BuildConfigure;
@@ -59,7 +59,7 @@ public function testConfigureWarningDiff(): void
         }
 
         // Submit our testing data.
-        $dir = dirname(__FILE__) . '/data/ConfigureWarnings';
+        $dir = __DIR__ . '/data/ConfigureWarnings';
         $this->submission('ConfigureWarningProject', "$dir/1.xml");
         $this->submission('ConfigureWarningProject', "$dir/2.xml");
 
diff --git a/app/cdash/tests/test_consistenttestingday.php b/app/cdash/tests/test_consistenttestingday.php
index 05b6b99d2f..af28d9d985 100644
--- a/app/cdash/tests/test_consistenttestingday.php
+++ b/app/cdash/tests/test_consistenttestingday.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Utils\TestingDay;
 use CDash\Database;
@@ -39,7 +39,7 @@ public function testConsistentTestingDay(): void
         $this->project->Save();
 
         // Submit our testing data.
-        $dir = dirname(__FILE__) . '/data/TestingDay';
+        $dir = __DIR__ . '/data/TestingDay';
         $this->submission('ConsistentTestingDay', "$dir/Test_1.xml");
         $this->submission('ConsistentTestingDay', "$dir/Test_2.xml");
 
diff --git a/app/cdash/tests/test_coveragedirectories.php b/app/cdash/tests/test_coveragedirectories.php
index a039d612ec..b0a76daf30 100644
--- a/app/cdash/tests/test_coveragedirectories.php
+++ b/app/cdash/tests/test_coveragedirectories.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Model\Project;
 
@@ -34,7 +34,7 @@ public function testCoverageDirectories(): void
         }
 
         $filesToSubmit = ['prefix-Coverage.xml', 'prefix-CoverageLog-0.xml', 'sort-Coverage.xml', 'sort-CoverageLog-0.xml', 'sort-CoverageLog-1.xml'];
-        $dir = dirname(__FILE__) . '/data/CoverageDirectories';
+        $dir = __DIR__ . '/data/CoverageDirectories';
         foreach ($filesToSubmit as $file) {
             if (!$this->submission('CoverageDirectories', "$dir/$file")) {
                 $this->fail("Failed to submit $file");
diff --git a/app/cdash/tests/test_createprojectpermissions.php b/app/cdash/tests/test_createprojectpermissions.php
index 725684c6a7..805f6556e6 100644
--- a/app/cdash/tests/test_createprojectpermissions.php
+++ b/app/cdash/tests/test_createprojectpermissions.php
@@ -7,7 +7,7 @@
 use CDash\Database;
 use Illuminate\Support\Facades\DB;
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class CreateProjectPermissionsTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/test_createpublicdashboard.php b/app/cdash/tests/test_createpublicdashboard.php
index 56679d394c..e01085f4d4 100644
--- a/app/cdash/tests/test_createpublicdashboard.php
+++ b/app/cdash/tests/test_createpublicdashboard.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class CreatePublicDashboardTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/test_crosssubprojectcoverage.php b/app/cdash/tests/test_crosssubprojectcoverage.php
index 6196ef413a..ff8ce1bf92 100644
--- a/app/cdash/tests/test_crosssubprojectcoverage.php
+++ b/app/cdash/tests/test_crosssubprojectcoverage.php
@@ -17,7 +17,7 @@
 
 use Illuminate\Support\Facades\DB;
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class CoverageAcrossSubProjectsTestCase extends KWWebTestCase
 {
@@ -27,7 +27,7 @@ public function __construct()
     {
         parent::__construct();
         $this->deleteLog($this->logfilename);
-        $this->DataDir = dirname(__FILE__) . '/data/CoverageAcrossSubProjects';
+        $this->DataDir = __DIR__ . '/data/CoverageAcrossSubProjects';
     }
 
     public function testCreateProjectTest(): void
diff --git a/app/cdash/tests/test_csvexport.php b/app/cdash/tests/test_csvexport.php
index edf6ae9719..4bb7540677 100644
--- a/app/cdash/tests/test_csvexport.php
+++ b/app/cdash/tests/test_csvexport.php
@@ -6,7 +6,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class ExportToCSVTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/test_deferredsubmissions.php b/app/cdash/tests/test_deferredsubmissions.php
index db550fc810..02808dbdc3 100644
--- a/app/cdash/tests/test_deferredsubmissions.php
+++ b/app/cdash/tests/test_deferredsubmissions.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 require_once 'tests/test_branchcoverage.php';
 
 use App\Models\AuthToken;
@@ -26,7 +26,7 @@ class DeferredSubmissionsTestCase extends BranchCoverageTestCase
     public function __construct()
     {
         parent::__construct();
-        $this->ConfigFile = dirname(__FILE__) . '/../../../.env';
+        $this->ConfigFile = __DIR__ . '/../../../.env';
         $this->Original = file_get_contents($this->ConfigFile);
 
         // Make sure we start from scratch each time the test is run.
@@ -43,7 +43,7 @@ public function __construct()
         $this->project->Fill();
 
         $this->token = '';
-        $this->dataDir = dirname(__FILE__) . '/data/DeferredSubmission';
+        $this->dataDir = __DIR__ . '/data/DeferredSubmission';
     }
 
     public function __destruct()
diff --git a/app/cdash/tests/test_deletesubproject.php b/app/cdash/tests/test_deletesubproject.php
index 086a816460..c757272445 100644
--- a/app/cdash/tests/test_deletesubproject.php
+++ b/app/cdash/tests/test_deletesubproject.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class DeleteSubProjectTestCase extends KWWebTestCase
 {
@@ -19,7 +19,7 @@ public function testDeleteSubProject()
         $this->assertText('FEApp');
 
         echo "submitting data/DeleteSubProject/Project.xml\n";
-        $file = dirname(__FILE__) . '/data/DeleteSubProject/Project.xml';
+        $file = __DIR__ . '/data/DeleteSubProject/Project.xml';
 
         if (!$this->submission('Trilinos', $file)) {
             return false;
diff --git a/app/cdash/tests/test_disabledtests.php b/app/cdash/tests/test_disabledtests.php
index e439ef1f80..af7dc4a6e2 100644
--- a/app/cdash/tests/test_disabledtests.php
+++ b/app/cdash/tests/test_disabledtests.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Utils\DatabaseCleanupUtils;
 use CDash\Database;
@@ -21,7 +21,7 @@ public function testDisabledTests(): void
         $this->deleteLog($this->logfilename);
 
         // Submit testing data.
-        $rep = dirname(__FILE__) . '/data/DisabledTests';
+        $rep = __DIR__ . '/data/DisabledTests';
         $file = "$rep/Test.xml";
         if (!$this->submission('EmailProjectExample', $file)) {
             return;
diff --git a/app/cdash/tests/test_displayimage.php b/app/cdash/tests/test_displayimage.php
index 4dadd39846..23f4e0a626 100644
--- a/app/cdash/tests/test_displayimage.php
+++ b/app/cdash/tests/test_displayimage.php
@@ -8,7 +8,7 @@
 use CDash\Model\Project;
 use Illuminate\Support\Facades\DB;
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class DisplayImageTestCase extends KWWebTestCase
 {
@@ -20,7 +20,7 @@ public function __construct()
     public function testDisplayImage()
     {
         $image = new Image();
-        $image->Filename = dirname(__FILE__) . '/data/smile.gif';
+        $image->Filename = __DIR__ . '/data/smile.gif';
         $image->Extension = 'image/gif';
         $image->Checksum = 100;
         $image->Save();
diff --git a/app/cdash/tests/test_donehandler.php b/app/cdash/tests/test_donehandler.php
index c55acfb160..18c01d3f9d 100644
--- a/app/cdash/tests/test_donehandler.php
+++ b/app/cdash/tests/test_donehandler.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Models\PendingSubmissions;
 use App\Models\Site;
@@ -34,7 +34,7 @@ public function testDoneHandlerRemote(): void
             return;
         }
 
-        $this->ConfigFile = dirname(__FILE__) . '/../../../.env';
+        $this->ConfigFile = __DIR__ . '/../../../.env';
         $this->Original = file_get_contents($this->ConfigFile);
 
         config(['cdash.remote_workers' => 'true']);
diff --git a/app/cdash/tests/test_dynamicanalysisdefectlongtype.php b/app/cdash/tests/test_dynamicanalysisdefectlongtype.php
index fef3b2e9a5..83e5fd6207 100644
--- a/app/cdash/tests/test_dynamicanalysisdefectlongtype.php
+++ b/app/cdash/tests/test_dynamicanalysisdefectlongtype.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Model\Project;
 use Illuminate\Support\Facades\DB;
@@ -35,7 +35,7 @@ public function testDynamicAnalysisDefectLongType(): void
         $this->project->Fill();
 
         // Submit our testing data.
-        $file = dirname(__FILE__) . '/data/DynamicAnalysisDefectLongType/DynamicAnalysis.xml';
+        $file = __DIR__ . '/data/DynamicAnalysisDefectLongType/DynamicAnalysis.xml';
         if (!$this->submission('DynamicAnalysisDefectLongType', $file)) {
             $this->fail("Failed to submit {$file}");
         }
diff --git a/app/cdash/tests/test_dynamicanalysislogs.php b/app/cdash/tests/test_dynamicanalysislogs.php
index 92bcb88d4e..e312c8a7a6 100644
--- a/app/cdash/tests/test_dynamicanalysislogs.php
+++ b/app/cdash/tests/test_dynamicanalysislogs.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Model\DynamicAnalysis;
 use CDash\Model\Project;
@@ -36,7 +36,7 @@ public function testDynamicAnalysisLogs(): void
         $this->project->Fill();
 
         // Submit our testing data.
-        $test_dir = dirname(__FILE__) . '/data/DynamicAnalysisLogs/';
+        $test_dir = __DIR__ . '/data/DynamicAnalysisLogs/';
         $files = ['Build.xml', 'Configure.xml', 'Test.xml', 'DynamicAnalysis.xml'];
         foreach ($files as $file) {
             if (!$this->submission('DynamicAnalysisLogs', "{$test_dir}/{$file}")) {
diff --git a/app/cdash/tests/test_dynamicanalysissummary.php b/app/cdash/tests/test_dynamicanalysissummary.php
index abdb68ce46..22e1dfd7f4 100644
--- a/app/cdash/tests/test_dynamicanalysissummary.php
+++ b/app/cdash/tests/test_dynamicanalysissummary.php
@@ -18,7 +18,7 @@
 use App\Utils\DatabaseCleanupUtils;
 use Illuminate\Support\Facades\DB;
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class DynamicAnalysisSummaryTestCase extends KWWebTestCase
 {
@@ -31,7 +31,7 @@ public function __construct()
     {
         parent::__construct();
         $this->deleteLog($this->logfilename);
-        $this->DataDir = dirname(__FILE__) . '/data/DynamicAnalysisSummary';
+        $this->DataDir = __DIR__ . '/data/DynamicAnalysisSummary';
         $this->ParentId = 0;
         $this->StandaloneBuildId = 0;
         $this->ChildIds = [];
@@ -41,7 +41,7 @@ public function testDynamicAnalysisSummary()
     {
         // Submit our testing file.  This should have already been submitted
         // by an earlier test, but it doesn't hurt to send it up a second time.
-        $file = dirname(__FILE__) . '/data/InsightExperimentalExample/Insight_Experimental_DynamicAnalysis.xml';
+        $file = __DIR__ . '/data/InsightExperimentalExample/Insight_Experimental_DynamicAnalysis.xml';
         if (!$this->submission('InsightExample', $file)) {
             $this->fail("Failed to submit $file");
             return 1;
@@ -54,7 +54,7 @@ public function testSubProjectDynamicAnalysisSummary()
     {
         // Submit our testing files.
         for ($i = 1; $i < 4; $i++) {
-            $file = dirname(__FILE__) . "/data/SubProjectDynamicAnalysis/DynamicAnalysis_$i.xml";
+            $file = __DIR__ . "/data/SubProjectDynamicAnalysis/DynamicAnalysis_$i.xml";
             if (!$this->submission('CrossSubProjectExample', $file)) {
                 $this->fail("Failed to submit $file");
                 return 1;
diff --git a/app/cdash/tests/test_email.php b/app/cdash/tests/test_email.php
index 38805f77dc..da25bb307b 100644
--- a/app/cdash/tests/test_email.php
+++ b/app/cdash/tests/test_email.php
@@ -5,7 +5,7 @@
 use App\Models\User;
 use Illuminate\Support\Facades\DB;
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class EmailTestCase extends KWWebTestCase
 {
@@ -83,7 +83,7 @@ public function testRegisterNoEmailUser(): void
     public function testSubmissionFirstBuild(): void
     {
         $this->deleteLog($this->logfilename);
-        $rep = dirname(__FILE__) . '/data/EmailProjectExample';
+        $rep = __DIR__ . '/data/EmailProjectExample';
         $file = "$rep/1_build.xml";
         if (!$this->submission('EmailProjectExample', $file)) {
             return;
@@ -105,7 +105,7 @@ public function testSubmissionFirstBuild(): void
     public function testSubmissionEmailBuild(): void
     {
         $this->deleteLog($this->logfilename);
-        $rep = dirname(__FILE__) . '/data/EmailProjectExample';
+        $rep = __DIR__ . '/data/EmailProjectExample';
         $file = "$rep/2_build.xml";
         if (!$this->submission('EmailProjectExample', $file)) {
             return;
@@ -137,7 +137,7 @@ public function testSubmissionEmailBuild(): void
     public function testSubmissionEmailTest(): void
     {
         $this->deleteLog($this->logfilename);
-        $rep = dirname(__FILE__) . '/data/EmailProjectExample';
+        $rep = __DIR__ . '/data/EmailProjectExample';
         $file = "$rep/2_test.xml";
 
         if (!$this->submission('EmailProjectExample', $file)) {
@@ -164,7 +164,7 @@ public function testSubmissionEmailTest(): void
     public function testSubmissionEmailDynamicAnalysis(): void
     {
         $this->deleteLog($this->logfilename);
-        $rep = dirname(__FILE__) . '/data/EmailProjectExample';
+        $rep = __DIR__ . '/data/EmailProjectExample';
         $file = "$rep/2_dynamicanalysis.xml";
 
         if (!$this->submission('EmailProjectExample', $file)) {
@@ -215,7 +215,7 @@ public function testSubmissionEmailDynamicAnalysis(): void
 
     public function testEmailSentToGitCommitter(): void
     {
-        $rep = dirname(__FILE__) . '/data/EmailProjectExample';
+        $rep = __DIR__ . '/data/EmailProjectExample';
         $file = "$rep/3_update.xml";
         if (!$this->submission('EmailProjectExample', $file)) {
             return;
@@ -323,7 +323,7 @@ public function testUpdateErrorEmailSentToSiteMaintainer(): void
         DB::insert('INSERT INTO site2user (siteid, userid) VALUES (?, ?)', [$site->id, 1]);
 
         // Submit our testing data.
-        $rep = dirname(__FILE__) . '/data/EmailProjectExample';
+        $rep = __DIR__ . '/data/EmailProjectExample';
         $file = "$rep/update_error.xml";
         if (!$this->submission('EmailProjectExample', $file)) {
             $this->fail('Failed to submit update_error.xml');
diff --git a/app/cdash/tests/test_enable_async.php b/app/cdash/tests/test_enable_async.php
index eb5e355d56..3d5980626f 100644
--- a/app/cdash/tests/test_enable_async.php
+++ b/app/cdash/tests/test_enable_async.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class EnableAsynchronousTestCase extends KWWebTestCase
 {
@@ -15,7 +15,7 @@ public function __construct()
 
     public function testEnableAsynchronous(): void
     {
-        $filename = dirname(__FILE__) . '/../../../.env';
+        $filename = __DIR__ . '/../../../.env';
         // Using .env, we no longer have to worry about being inside the closing PHP bracket.
         $injectedText = "// test config settings injected by file [' . __FILE__ . ']\nCDASH_ASYNCHRONOUS_SUBMISSION = true";
         file_put_contents($filename, $injectedText, FILE_APPEND);
diff --git a/app/cdash/tests/test_excludesubprojects.php b/app/cdash/tests/test_excludesubprojects.php
index baaccbfb7e..d09bf3b6ff 100644
--- a/app/cdash/tests/test_excludesubprojects.php
+++ b/app/cdash/tests/test_excludesubprojects.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class ExcludeSubProjectsTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/test_expectedandmissing.php b/app/cdash/tests/test_expectedandmissing.php
index 475826a260..23f6fcdfd8 100644
--- a/app/cdash/tests/test_expectedandmissing.php
+++ b/app/cdash/tests/test_expectedandmissing.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Database;
 use CDash\Model\Build;
diff --git a/app/cdash/tests/test_expiredbuildrules.php b/app/cdash/tests/test_expiredbuildrules.php
index c1d5f1dabc..702f95a0ea 100644
--- a/app/cdash/tests/test_expiredbuildrules.php
+++ b/app/cdash/tests/test_expiredbuildrules.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Database;
 use CDash\Model\BuildGroup;
diff --git a/app/cdash/tests/test_externallinksfromtests.php b/app/cdash/tests/test_externallinksfromtests.php
index 30a7361f5b..5cac255ff2 100644
--- a/app/cdash/tests/test_externallinksfromtests.php
+++ b/app/cdash/tests/test_externallinksfromtests.php
@@ -7,7 +7,7 @@
 use App\Utils\DatabaseCleanupUtils;
 use Illuminate\Support\Facades\DB;
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class ExternalLinksFromTestsTestCase extends KWWebTestCase
 {
@@ -20,7 +20,7 @@ public function testExternalLinksFromTests()
     {
         // Submit our testing data.
         $file_to_submit =
-            dirname(__FILE__) . '/data/ExternalLinksFromTests/Test.xml';
+            __DIR__ . '/data/ExternalLinksFromTests/Test.xml';
         if (!$this->submission('InsightExample', $file_to_submit)) {
             $this->fail("Failed to submit $file_to_submit");
             return 1;
diff --git a/app/cdash/tests/test_filterblocks.php b/app/cdash/tests/test_filterblocks.php
index 738517e7fa..f65e05abed 100644
--- a/app/cdash/tests/test_filterblocks.php
+++ b/app/cdash/tests/test_filterblocks.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class FilterBlocksTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/test_filterbuilderrors.php b/app/cdash/tests/test_filterbuilderrors.php
index 92a2ac2937..51de9a9ece 100644
--- a/app/cdash/tests/test_filterbuilderrors.php
+++ b/app/cdash/tests/test_filterbuilderrors.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Utils\DatabaseCleanupUtils;
 use CDash\Database;
@@ -39,7 +39,7 @@ public function testFilterBuildErrors()
         $project->Id = $projectid;
 
         // Submit our test data.
-        $rep = dirname(__FILE__) . '/data/BuildFailureDetails';
+        $rep = __DIR__ . '/data/BuildFailureDetails';
         if (!$this->submission('FilterErrors', "$rep/Build_1.xml")) {
             $this->fail('failed to submit Build_1.xml');
             return 1;
diff --git a/app/cdash/tests/test_filtertestlabels.php b/app/cdash/tests/test_filtertestlabels.php
index e70b9b57fe..4ccde08115 100644
--- a/app/cdash/tests/test_filtertestlabels.php
+++ b/app/cdash/tests/test_filtertestlabels.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Utils\DatabaseCleanupUtils;
 
@@ -18,7 +18,7 @@ public function __construct()
     public function testFilterLabels()
     {
         // Submit our test data.
-        $rep = dirname(__FILE__) . '/data/FilterTestLabels';
+        $rep = __DIR__ . '/data/FilterTestLabels';
         if (!$this->submission('EmailProjectExample', "$rep/Build_1.xml")) {
             $this->fail('failed to submit Update_1.xml');
             return 1;
diff --git a/app/cdash/tests/test_hidecolumns.php b/app/cdash/tests/test_hidecolumns.php
index 0acdd9d1c2..2f3bb7c982 100644
--- a/app/cdash/tests/test_hidecolumns.php
+++ b/app/cdash/tests/test_hidecolumns.php
@@ -7,7 +7,7 @@
 use App\Utils\DatabaseCleanupUtils;
 use Illuminate\Support\Facades\DB;
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class HideColumnsTestCase extends KWWebTestCase
 {
@@ -42,7 +42,7 @@ public function testHideColumns()
     public function onlyColumn($method)
     {
         // Submit our testing file.
-        $rep = dirname(__FILE__) . '/data/HideColumns';
+        $rep = __DIR__ . '/data/HideColumns';
         if (!$this->submission('InsightExample', "$rep/$method.xml")) {
             return false;
         }
diff --git a/app/cdash/tests/test_image.php b/app/cdash/tests/test_image.php
index d83180250b..296d261a0b 100644
--- a/app/cdash/tests/test_image.php
+++ b/app/cdash/tests/test_image.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Model\Image;
 
@@ -19,7 +19,7 @@ public function testImage()
     {
         $image = new Image();
 
-        $pathToImage = dirname(__FILE__) . '/data/smile.gif';
+        $pathToImage = __DIR__ . '/data/smile.gif';
         $image->Filename = $pathToImage;
         $image->Extension = 'image/gif';
         // dummy checksum so we don't break the test on pgSQL
diff --git a/app/cdash/tests/test_imagecomparison.php b/app/cdash/tests/test_imagecomparison.php
index 5ca775c107..0300d9840d 100644
--- a/app/cdash/tests/test_imagecomparison.php
+++ b/app/cdash/tests/test_imagecomparison.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Utils\DatabaseCleanupUtils;
 use CDash\Database;
@@ -23,7 +23,7 @@ public function __construct()
     public function testImageComparison()
     {
         // Submit test data.
-        if (!$this->submission('InsightExample', dirname(__FILE__) . '/data/ImageComparisonTest.xml')) {
+        if (!$this->submission('InsightExample', __DIR__ . '/data/ImageComparisonTest.xml')) {
             $this->fail('Failed to submit test data');
             return 1;
         }
diff --git a/app/cdash/tests/test_indexfilters.php b/app/cdash/tests/test_indexfilters.php
index bdb109603e..35b7e2504a 100644
--- a/app/cdash/tests/test_indexfilters.php
+++ b/app/cdash/tests/test_indexfilters.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class IndexFiltersTestCase extends KWWebTestCase
 {
@@ -43,7 +43,7 @@ public function testIndexFilters(): void
 
     public function filter($field, $compare, $value, $expected, $url = null)
     {
-        if (is_null($url)) {
+        if (null === $url) {
             $url = $this->InsightUrl;
         }
         $filter_string = "filtercount=1&showfilters=1&field1=$field&compare1=$compare&value1=$value";
diff --git a/app/cdash/tests/test_indexnextprevious.php b/app/cdash/tests/test_indexnextprevious.php
index 9ae92abd53..60206d1c7a 100644
--- a/app/cdash/tests/test_indexnextprevious.php
+++ b/app/cdash/tests/test_indexnextprevious.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Models\Site;
 use CDash\Model\Build;
diff --git a/app/cdash/tests/test_install.php b/app/cdash/tests/test_install.php
index 2447342fa4..3698719d62 100644
--- a/app/cdash/tests/test_install.php
+++ b/app/cdash/tests/test_install.php
@@ -2,7 +2,7 @@
 
 use Illuminate\Support\Facades\Artisan;
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class InstallTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/test_issuecreation.php b/app/cdash/tests/test_issuecreation.php
index 20e7b37602..8041068295 100644
--- a/app/cdash/tests/test_issuecreation.php
+++ b/app/cdash/tests/test_issuecreation.php
@@ -64,7 +64,7 @@ public function testIssueCreation(): void
             'Insight_Experimental_DynamicAnalysis.xml',
             'Insight_Experimental_Test.xml'];
         foreach ($filenames as $filename) {
-            $file = dirname(__FILE__) . "/data/InsightExperimentalExample/$filename";
+            $file = __DIR__ . "/data/InsightExperimentalExample/$filename";
             if (!$this->submission('IssueCreationProject', $file)) {
                 $this->fail("Failed to submit $file");
             }
@@ -103,7 +103,7 @@ public function testIssueCreation(): void
             ]);
 
         // Setup subprojects.
-        $file = dirname(__FILE__) . '/data/GithubPR/Project.xml';
+        $file = __DIR__ . '/data/GithubPR/Project.xml';
         if (!$this->submission('CDash', $file)) {
             $this->fail("Failed to submit $file");
         }
@@ -116,7 +116,7 @@ public function testIssueCreation(): void
         }
 
         // Submit subproject XML file.
-        $file = dirname(__FILE__) . '/data/GithubPR/Test.xml';
+        $file = __DIR__ . '/data/GithubPR/Test.xml';
         if (!$this->submission('CDash', $file)) {
             $this->fail("Failed to submit $file");
         }
diff --git a/app/cdash/tests/test_javajsoncoverage.php b/app/cdash/tests/test_javajsoncoverage.php
index 4601354b99..82e2ccab9e 100644
--- a/app/cdash/tests/test_javajsoncoverage.php
+++ b/app/cdash/tests/test_javajsoncoverage.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class JavaJSONCoverageTestCase extends KWWebTestCase
 {
@@ -44,7 +44,7 @@ public function testJavaJSONCoverage()
 
         // Do the PUT submission to actually upload our data.
         $puturl = $this->url . "/submit.php?type=JavaJSONTar&md5=67b5d3cee7b951ff2981c440b4a515ec&filename=JavaJSONTar_example.tar&buildid=$buildid";
-        $filename = dirname(__FILE__) . '/data/JavaJSONTar_example.tar';
+        $filename = __DIR__ . '/data/JavaJSONTar_example.tar';
 
         $put_result = $this->uploadfile($puturl, $filename);
         if (!str_contains($put_result, '{"status":0}')) {
diff --git a/app/cdash/tests/test_jscovercoverage.php b/app/cdash/tests/test_jscovercoverage.php
index 2a96033477..579428d684 100644
--- a/app/cdash/tests/test_jscovercoverage.php
+++ b/app/cdash/tests/test_jscovercoverage.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class JSCoverCoverageTestCase extends KWWebTestCase
 {
@@ -44,7 +44,7 @@ public function testJSCoverCoverage()
 
         // Do the PUT submission to actually upload our data.
         $puturl = $this->url . "/submit.php?type=JSCoverTar&md5=e99bdd400ab4643e4fbeef7ec649f04e&filename=JSCoverTest.tar&buildid=$buildid";
-        $filename = dirname(__FILE__) . '/data/JSCoverTest.tar';
+        $filename = __DIR__ . '/data/JSCoverTest.tar';
 
         $put_result = $this->uploadfile($puturl, $filename);
         if (!str_contains($put_result, '{"status":0}')) {
diff --git a/app/cdash/tests/test_junithandler.php b/app/cdash/tests/test_junithandler.php
index a5ce45a8f0..2301feb5d3 100644
--- a/app/cdash/tests/test_junithandler.php
+++ b/app/cdash/tests/test_junithandler.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Database;
 use CDash\Model\Project;
@@ -43,7 +43,7 @@ public function testJUnitHandler(): void
         $this->Project->Id = $projectid;
 
         // Submit our test data.
-        $xml = dirname(__FILE__) . '/data/JUNit_example.xml';
+        $xml = __DIR__ . '/data/JUNit_example.xml';
         if (!$this->submission('JUnitHandlerProject', $xml)) {
             $this->fail('Failed to submit test data');
         }
diff --git a/app/cdash/tests/test_limitedbuilds.php b/app/cdash/tests/test_limitedbuilds.php
index 28bc843f3c..af8eea1551 100644
--- a/app/cdash/tests/test_limitedbuilds.php
+++ b/app/cdash/tests/test_limitedbuilds.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Database;
 use CDash\Model\Build;
@@ -22,7 +22,7 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->testDataDir = dirname(__FILE__) . '/data/BuildModel';
+        $this->testDataDir = __DIR__ . '/data/BuildModel';
         $this->PDO = Database::getInstance();
         $this->get_build_stmt = $this->PDO->prepare('SELECT id FROM build WHERE projectid = ?');
         $this->Projects = [];
diff --git a/app/cdash/tests/test_longbuildname.php b/app/cdash/tests/test_longbuildname.php
index 892f71177a..9721a68a20 100644
--- a/app/cdash/tests/test_longbuildname.php
+++ b/app/cdash/tests/test_longbuildname.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Models\Build;
 use CDash\Model\Project;
@@ -38,7 +38,7 @@ public function testLongBuildName(): void
         $this->deleteLog($this->logfilename);
 
         // Submit our testing data.
-        $test_dir = dirname(__FILE__) . '/data/LongBuildName/';
+        $test_dir = __DIR__ . '/data/LongBuildName/';
         $filename = "{$test_dir}/Configure.xml";
         if (!$this->submission('LongBuildName', $filename)) {
             $this->fail("Failed to submit {$filename}");
diff --git a/app/cdash/tests/test_lotsofsubprojects.php b/app/cdash/tests/test_lotsofsubprojects.php
index 7a3bd108c0..f381dcefb1 100644
--- a/app/cdash/tests/test_lotsofsubprojects.php
+++ b/app/cdash/tests/test_lotsofsubprojects.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Model\Project;
 use Illuminate\Support\Facades\DB;
@@ -45,13 +45,13 @@ public function testLotsOfSubProjects(): void
         // big test file to our repository.
         $test_filename = 'LotsOfSubProjects_Configure.xml';
         $handle = fopen($test_filename, 'w');
-        fwrite($handle, file_get_contents(dirname(__FILE__) . '/data/LotsOfSubProjects/Before.xml'));
+        fwrite($handle, file_get_contents(__DIR__ . '/data/LotsOfSubProjects/Before.xml'));
         foreach (range(1, 100) as $i) {
             fwrite($handle, "	<Subproject name=\"LotsOfSubProjects{$i}\">" . PHP_EOL);
             fwrite($handle, "		<Label>LotsOfSubProjects{$i}</Label>" . PHP_EOL);
             fwrite($handle, '	</Subproject>' . PHP_EOL);
         }
-        fwrite($handle, file_get_contents(dirname(__FILE__) . '/data/LotsOfSubProjects/After.xml'));
+        fwrite($handle, file_get_contents(__DIR__ . '/data/LotsOfSubProjects/After.xml'));
 
         // Submit our testing data.
         if (!$this->submission('LotsOfSubProjects', $test_filename)) {
diff --git a/app/cdash/tests/test_managemeasurements.php b/app/cdash/tests/test_managemeasurements.php
index b15c4f35dc..4f9bddaca0 100644
--- a/app/cdash/tests/test_managemeasurements.php
+++ b/app/cdash/tests/test_managemeasurements.php
@@ -5,7 +5,7 @@
 // relative to the top of the CDash source tree
 //
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Models\Measurement;
 use App\Utils\DatabaseCleanupUtils;
@@ -34,10 +34,10 @@ public function __construct()
 
     public function __destruct()
     {
-        if (!is_null($this->BuildId)) {
+        if (null !== $this->BuildId) {
             DatabaseCleanupUtils::removeBuild($this->BuildId);
         }
-        if (!is_null($this->SubProjectBuildId)) {
+        if (null !== $this->SubProjectBuildId) {
             DatabaseCleanupUtils::removeBuild($this->SubProjectBuildId);
         }
 
@@ -116,7 +116,7 @@ private function validate_subproject_test($test_name, $num_procs, $proc_time, $i
     public function testManageMeasurements()
     {
         // Submit a test file with a named measurement.
-        $testDataFile = dirname(__FILE__) . '/data/TestMeasurements/Test.xml';
+        $testDataFile = __DIR__ . '/data/TestMeasurements/Test.xml';
         if (!$this->submission('InsightExample', $testDataFile)) {
             $this->fail('Failed to submit Test.xml');
             return false;
@@ -131,12 +131,12 @@ public function testManageMeasurements()
         }
 
         // Submit subproject test data too.
-        $projectFile = dirname(__FILE__) . '/data/MultipleSubprojects/Project.xml';
+        $projectFile = __DIR__ . '/data/MultipleSubprojects/Project.xml';
         if (!$this->submission('SubProjectExample', $projectFile)) {
             $this->fail('Failed to submit Project.xml');
             return false;
         }
-        $testDataFile = dirname(__FILE__) . '/data/TestMeasurements/Test_subproj.xml';
+        $testDataFile = __DIR__ . '/data/TestMeasurements/Test_subproj.xml';
         if (!$this->submission('SubProjectExample', $testDataFile)) {
             $this->fail('Failed to submit Test_subproj.xml');
             return false;
diff --git a/app/cdash/tests/test_misassignedconfigure.php b/app/cdash/tests/test_misassignedconfigure.php
index 19a7217a12..628c9d5def 100644
--- a/app/cdash/tests/test_misassignedconfigure.php
+++ b/app/cdash/tests/test_misassignedconfigure.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Model\Project;
 use Illuminate\Support\Facades\DB;
@@ -32,7 +32,7 @@ public function testMisassignedConfigure(): void
         $this->project->Fill();
         $this->deleteLog($this->logfilename);
 
-        $data_dir = dirname(__FILE__) . '/data/MultipleSubprojects/';
+        $data_dir = __DIR__ . '/data/MultipleSubprojects/';
 
         // Submit some testing data.
         $this->submission($this->project->Name, "{$data_dir}/Configure_bad.xml");
diff --git a/app/cdash/tests/test_multicoverage.php b/app/cdash/tests/test_multicoverage.php
index b8aab3f672..17a3d5f2be 100644
--- a/app/cdash/tests/test_multicoverage.php
+++ b/app/cdash/tests/test_multicoverage.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Utils\DatabaseCleanupUtils;
 
@@ -55,7 +55,7 @@ public function testTarFirst()
     public function submitXML()
     {
         $filesToSubmit = ['Coverage.xml', 'CoverageLog-0.xml'];
-        $dir = dirname(__FILE__) . '/data/MultiCoverage';
+        $dir = __DIR__ . '/data/MultiCoverage';
         foreach ($filesToSubmit as $file) {
             if (!$this->submission('TrilinosDriver', "$dir/$file")) {
                 $this->fail("Failed to submit $file");
@@ -94,7 +94,7 @@ public function submitTar()
 
         // Do the PUT submission to actually upload our data.
         $puturl = $this->url . "/submit.php?type=GcovTar&md5=65f385dd8d360e78a35453144c0919ab&filename=gcov.tar&buildid=$this->BuildId";
-        $filename = dirname(__FILE__) . '/data/MultiCoverage/gcov.tar';
+        $filename = __DIR__ . '/data/MultiCoverage/gcov.tar';
 
         $put_result = $this->uploadfile($puturl, $filename);
         if (!str_contains($put_result, '{"status":0}')) {
diff --git a/app/cdash/tests/test_multiplelabelsfortests.php b/app/cdash/tests/test_multiplelabelsfortests.php
index 3fc33c7b34..96546d2285 100644
--- a/app/cdash/tests/test_multiplelabelsfortests.php
+++ b/app/cdash/tests/test_multiplelabelsfortests.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Models\Test;
 use CDash\Model\Project;
@@ -39,7 +39,7 @@ public function testMultipleLabelsForTests(): void
         $this->deleteLog($this->logfilename);
 
         // Submit our testing data.
-        $test_dir = dirname(__FILE__) . '/data/MultipleLabelsForTests/';
+        $test_dir = __DIR__ . '/data/MultipleLabelsForTests/';
         $filename = "{$test_dir}/Test.xml";
         if (!$this->submission('MultipleLabelsForTests', $filename)) {
             $this->fail("Failed to submit {$filename}");
diff --git a/app/cdash/tests/test_multiplesubprojects.php b/app/cdash/tests/test_multiplesubprojects.php
index da29aba00c..bcf6669feb 100644
--- a/app/cdash/tests/test_multiplesubprojects.php
+++ b/app/cdash/tests/test_multiplesubprojects.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Utils\DatabaseCleanupUtils;
 use CDash\Database;
@@ -24,7 +24,7 @@ class MultipleSubprojectsTestCase extends KWWebTestCase
     public function __construct()
     {
         parent::__construct();
-        $this->dataDir = dirname(__FILE__) . '/data/MultipleSubprojects';
+        $this->dataDir = __DIR__ . '/data/MultipleSubprojects';
     }
 
     public function setUp(): void
@@ -138,7 +138,7 @@ private function restoreState()
         $this->restoreEmailPreference();
 
         // Remove extra subprojects
-        $rep = dirname(__FILE__) . '/data/SubProjectExample';
+        $rep = __DIR__ . '/data/SubProjectExample';
         $file = "$rep/Project_1.xml";
         if (!$this->submission('SubProjectExample', $file)) {
             $this->fail('failed to submit Project_1.xml');
diff --git a/app/cdash/tests/test_namedmeasurements.php b/app/cdash/tests/test_namedmeasurements.php
index 05fa7dc414..f44d11b420 100644
--- a/app/cdash/tests/test_namedmeasurements.php
+++ b/app/cdash/tests/test_namedmeasurements.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Model\Project;
 use Illuminate\Support\Facades\DB;
@@ -35,7 +35,7 @@ public function testNamedMeasurements(): void
         $this->project->Fill();
 
         // Submit our testing data.
-        $test_dir = dirname(__FILE__) . '/data/NamedMeasurements/';
+        $test_dir = __DIR__ . '/data/NamedMeasurements/';
         $files = ['Test_1.xml', 'Test_2.xml'];
         foreach ($files as $file) {
             if (!$this->submission('NamedMeasurements', "{$test_dir}/{$file}")) {
diff --git a/app/cdash/tests/test_nobackup.php b/app/cdash/tests/test_nobackup.php
index 95e171b653..f572227d64 100644
--- a/app/cdash/tests/test_nobackup.php
+++ b/app/cdash/tests/test_nobackup.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Utils\DatabaseCleanupUtils;
 use CDash\Database;
@@ -17,7 +17,7 @@ class NoBackupTestCase extends KWWebTestCase
     public function __construct()
     {
         parent::__construct();
-        $this->ConfigFile = dirname(__FILE__) . '/../../../.env';
+        $this->ConfigFile = __DIR__ . '/../../../.env';
         $this->Original = file_get_contents($this->ConfigFile);
     }
 
@@ -32,7 +32,7 @@ public function testNoBackup()
         file_put_contents($this->ConfigFile, "BACKUP_TIMEFRAME=0\n", FILE_APPEND | LOCK_EX);
 
         // Submit XML file.
-        $xml = dirname(__FILE__) . '/data/nobackup/Build.xml';
+        $xml = __DIR__ . '/data/nobackup/Build.xml';
         if (!$this->submission('InsightExample', $xml)) {
             $this->fail('failed to submit Build.xml');
             return 1;
@@ -63,7 +63,7 @@ public function testNoBackup()
             return 1;
         }
         $puturl = $this->url . "/submit.php?type=GcovTar&md5=5454e16948a1d58d897e174b75cc5633&filename=gcov.tar&buildid=$buildid";
-        $filename = dirname(__FILE__) . '/data/gcov.tar';
+        $filename = __DIR__ . '/data/gcov.tar';
         $put_result = $this->uploadfile($puturl, $filename);
         if (!str_contains($put_result, '{"status":0}')) {
             $this->fail(
diff --git a/app/cdash/tests/test_notesapi.php b/app/cdash/tests/test_notesapi.php
index 6cc8ca0292..e89d76370a 100644
--- a/app/cdash/tests/test_notesapi.php
+++ b/app/cdash/tests/test_notesapi.php
@@ -6,7 +6,7 @@
 //
 use Illuminate\Support\Facades\DB;
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class NotesAPICase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/test_notesparsererrormessages.php b/app/cdash/tests/test_notesparsererrormessages.php
index 0993ed196a..ef543ac103 100644
--- a/app/cdash/tests/test_notesparsererrormessages.php
+++ b/app/cdash/tests/test_notesparsererrormessages.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Model\Project;
 
@@ -34,7 +34,7 @@ public function testNotesParserErrorMessages(): void
         $this->project->Fill();
         $this->deleteLog($this->logfilename);
 
-        $test_dir = dirname(__FILE__) . '/data/NotesParserErrorMessages/';
+        $test_dir = __DIR__ . '/data/NotesParserErrorMessages/';
 
         $this->submission('NotesParserErrorMessages', "{$test_dir}/NoName.xml");
         $expected = [
diff --git a/app/cdash/tests/test_numericupdate.php b/app/cdash/tests/test_numericupdate.php
index 1bf217b22a..52f4667f92 100644
--- a/app/cdash/tests/test_numericupdate.php
+++ b/app/cdash/tests/test_numericupdate.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Models\Project;
 use Tests\Traits\CreatesProjects;
@@ -27,7 +27,7 @@ public function __destruct()
     public function testNumericUpdate(): void
     {
         // Submit our testing data.
-        $this->submission($this->project->name, dirname(__FILE__) . '/data/UpdateNumeric.xml');
+        $this->submission($this->project->name, __DIR__ . '/data/UpdateNumeric.xml');
 
         // Check index.php, make sure it shows the expected revision.
         $this->get($this->url . '/api/v1/index.php?project=' . $this->project->name . '&date=2020-06-01');
diff --git a/app/cdash/tests/test_opencovercoverage.php b/app/cdash/tests/test_opencovercoverage.php
index c2823ce790..9fecb58292 100644
--- a/app/cdash/tests/test_opencovercoverage.php
+++ b/app/cdash/tests/test_opencovercoverage.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Utils\DatabaseCleanupUtils;
 
@@ -54,7 +54,7 @@ public function testOpenCoverCoverage()
 
         // Do the PUT submission to actually upload our data.
         $puturl = $this->url . "/submit.php?type=OpenCoverTar&md5=c0eeaf6be9838eacc75e652d6c85f925&filename=OpenCoverTest.tar&buildid=$buildid";
-        $filename = dirname(__FILE__) . '/data/OpenCoverTest.tar';
+        $filename = __DIR__ . '/data/OpenCoverTest.tar';
         $put_result = $this->uploadfile($puturl, $filename);
         if (!str_contains($put_result, '{"status":0}')) {
             $this->fail(
@@ -105,7 +105,7 @@ public function testOpenCoverCoverageWithDataJson()
 
         // Do the PUT submission to actually upload our data.
         $puturl = $this->url . "/submit.php?type=OpenCoverTar&md5=21eb5dff198d703652f8a7c93a290140&filename=OpenCoverTestWithDataJson.tar&buildid=$buildid";
-        $filename = dirname(__FILE__) . '/data/OpenCoverTestWithDataJson.tar';
+        $filename = __DIR__ . '/data/OpenCoverTestWithDataJson.tar';
 
         $put_result = $this->uploadfile($puturl, $filename);
         if (!str_contains($put_result, '{"status":0}')) {
diff --git a/app/cdash/tests/test_outputcolor.php b/app/cdash/tests/test_outputcolor.php
index ea33922e83..d277a6be15 100644
--- a/app/cdash/tests/test_outputcolor.php
+++ b/app/cdash/tests/test_outputcolor.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Model\Project;
 use Illuminate\Support\Facades\DB;
@@ -35,7 +35,7 @@ public function testOutputColor(): void
         }
 
         // Submit testing data.
-        $file = dirname(__FILE__) . '/data/OutputColor/Test.xml';
+        $file = __DIR__ . '/data/OutputColor/Test.xml';
         if (!$this->submission('OutputColor', $file)) {
             $this->fail("Failed to submit $file");
             return;
@@ -64,7 +64,7 @@ public function testOutputColor(): void
         }
 
         // Verify that color output works as expected for preformatted test measurements too.
-        $file = dirname(__FILE__) . '/data/OutputColor/Test_2.xml';
+        $file = __DIR__ . '/data/OutputColor/Test_2.xml';
         if (!$this->submission('OutputColor', $file)) {
             $this->fail("Failed to submit $file");
             return;
@@ -82,7 +82,7 @@ public function testOutputColor(): void
         $this->assertEqual($expected, $measurement['value']);
 
         // Submit build data for later check in viewBuildErrors.
-        $file = dirname(__FILE__) . '/data/OutputColor/Build.xml';
+        $file = __DIR__ . '/data/OutputColor/Build.xml';
         if (!$this->submission('OutputColor', $file)) {
             $this->fail("Failed to submit $file");
         }
diff --git a/app/cdash/tests/test_parallelsubmissions.php b/app/cdash/tests/test_parallelsubmissions.php
index 1401659eff..e25bb1701a 100644
--- a/app/cdash/tests/test_parallelsubmissions.php
+++ b/app/cdash/tests/test_parallelsubmissions.php
@@ -5,7 +5,7 @@
 // relative to the top of the CDash source tree
 //
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 require_once 'tests/trilinos_submission_test.php';
 
 use App\Utils\DatabaseCleanupUtils;
@@ -20,7 +20,7 @@ class ParallelSubmissionsTestCase extends TrilinosSubmissionTestCase
     public function __construct()
     {
         parent::__construct();
-        $this->ConfigFile = dirname(__FILE__) . '/../../../.env';
+        $this->ConfigFile = __DIR__ . '/../../../.env';
         $this->Original = file_get_contents($this->ConfigFile);
     }
 
@@ -64,7 +64,7 @@ public function testParallelSubmissions(): void
         $this->assertEqual(147, $num_jobs);
 
         // Start 4 queue workers.
-        chdir(dirname(__FILE__) . '/../../../');
+        chdir(__DIR__ . '/../../../');
         foreach (range(0, 3) as $i) {
             exec('php artisan queue:work --stop-when-empty > /dev/null 2>&1 &');
         }
diff --git a/app/cdash/tests/test_passwordcomplexity.php b/app/cdash/tests/test_passwordcomplexity.php
index a8e4c6f5dc..1d89cd4af6 100644
--- a/app/cdash/tests/test_passwordcomplexity.php
+++ b/app/cdash/tests/test_passwordcomplexity.php
@@ -17,7 +17,7 @@
   PURPOSE. See the above copyright notices for more information.
 =========================================================================*/
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class PasswordComplexityTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/test_pdoexecutelogserrors.php b/app/cdash/tests/test_pdoexecutelogserrors.php
index 189186d569..60e77ff197 100644
--- a/app/cdash/tests/test_pdoexecutelogserrors.php
+++ b/app/cdash/tests/test_pdoexecutelogserrors.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Database;
 
diff --git a/app/cdash/tests/test_projectindb.php b/app/cdash/tests/test_projectindb.php
index a86928b0a9..d2302b66b5 100644
--- a/app/cdash/tests/test_projectindb.php
+++ b/app/cdash/tests/test_projectindb.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class ProjectInDbTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/test_projectmodel.php b/app/cdash/tests/test_projectmodel.php
index 10601154ce..fb40c4732b 100644
--- a/app/cdash/tests/test_projectmodel.php
+++ b/app/cdash/tests/test_projectmodel.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Model\Project;
 
diff --git a/app/cdash/tests/test_projectwebpage.php b/app/cdash/tests/test_projectwebpage.php
index 89e54834bf..01c23eb171 100644
--- a/app/cdash/tests/test_projectwebpage.php
+++ b/app/cdash/tests/test_projectwebpage.php
@@ -5,7 +5,7 @@
 // relative to the top of the CDash source tree
 //
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class ProjectWebPageTestCase extends KWWebTestCase
 {
@@ -29,63 +29,63 @@ public function testAccessToWebPageProjectTest(): void
 
     public function testSubmissionBatchmakeBuild(): void
     {
-        $rep = dirname(__FILE__) . '/data/BatchmakeNightlyExample';
+        $rep = __DIR__ . '/data/BatchmakeNightlyExample';
         $file = "$rep/BatchMake_Nightly_Build.xml";
         $this->assertTrue($this->submission('BatchmakeExample', $file), "Submission of $file failed");
     }
 
     public function testSubmissionBatchmakeConfigure(): void
     {
-        $rep = dirname(__FILE__) . '/data/BatchmakeNightlyExample';
+        $rep = __DIR__ . '/data/BatchmakeNightlyExample';
         $file = "$rep/BatchMake_Nightly_Configure.xml";
         $this->assertTrue($this->submission('BatchmakeExample', $file), "Submission of $file failed");
     }
 
     public function testSubmissionBatchmakeNotes(): void
     {
-        $rep = dirname(__FILE__) . '/data/BatchmakeNightlyExample';
+        $rep = __DIR__ . '/data/BatchmakeNightlyExample';
         $file = "$rep/BatchMake_Nightly_Notes.xml";
         $this->assertTrue($this->submission('BatchmakeExample', $file), "Submission of $file failed");
     }
 
     public function testSubmissionBatchmakeTest(): void
     {
-        $rep = dirname(__FILE__) . '/data/BatchmakeNightlyExample';
+        $rep = __DIR__ . '/data/BatchmakeNightlyExample';
         $file = "$rep/BatchMake_Nightly_Test.xml";
         $this->assertTrue($this->submission('BatchmakeExample', $file), "Submission of $file failed");
     }
 
     public function testSubmissionBatchmakeUpdate(): void
     {
-        $rep = dirname(__FILE__) . '/data/BatchmakeNightlyExample';
+        $rep = __DIR__ . '/data/BatchmakeNightlyExample';
         $file = "$rep/BatchMake_Nightly_Update.xml";
         $this->assertTrue($this->submission('BatchmakeExample', $file), "Submission of $file failed");
     }
 
     public function testSubmissionInsightBuild(): void
     {
-        $rep = dirname(__FILE__) . '/data/InsightExperimentalExample';
+        $rep = __DIR__ . '/data/InsightExperimentalExample';
         $file = "$rep/Insight_Experimental_Build.xml";
         $this->assertTrue($this->submission('InsightExample', $file), "Submission of $file failed");
     }
 
     public function testSubmissionInsightConfigure(): void
     {
-        $rep = dirname(__FILE__) . '/data/InsightExperimentalExample';
+        $rep = __DIR__ . '/data/InsightExperimentalExample';
         $file = "$rep/Insight_Experimental_Configure.xml";
         $this->assertTrue($this->submission('InsightExample', $file), "Submission of $file failed");
     }
 
     public function testSubmissionInsightCoverage(): void
     {
-        $rep = dirname(__FILE__) . '/data/InsightExperimentalExample';
+        $rep = __DIR__ . '/data/InsightExperimentalExample';
         $file = "$rep/Insight_Experimental_Coverage.xml";
         $this->assertTrue($this->submission('InsightExample', $file), "Submission of $file failed");
     }
 
     public function testSubmissionInsightCoverageLog(): void
     {
-        $rep = dirname(__FILE__) . '/data/InsightExperimentalExample';
+        $rep = __DIR__ . '/data/InsightExperimentalExample';
         $file = "$rep/Insight_Experimental_CoverageLog.xml";
         if (!$this->submission('InsightExample', $file)) {
             return;
@@ -111,7 +111,7 @@ public function testSubmissionInsightCoverageLog(): void
 
     public function testSubmissionInsightDynamicAnalysis(): void
     {
-        $rep = dirname(__FILE__) . '/data/InsightExperimentalExample';
+        $rep = __DIR__ . '/data/InsightExperimentalExample';
         $file = "$rep/Insight_Experimental_DynamicAnalysis.xml";
         if (!$this->submission('InsightExample', $file)) {
             return;
@@ -121,7 +121,7 @@ public function testSubmissionInsightDynamicAnalysis(): void
 
     public function testSubmissionInsightNotes(): void
     {
-        $rep = dirname(__FILE__) . '/data/InsightExperimentalExample';
+        $rep = __DIR__ . '/data/InsightExperimentalExample';
         $file = "$rep/Insight_Experimental_Notes.xml";
         if (!$this->submission('InsightExample', $file)) {
             return;
@@ -131,7 +131,7 @@ public function testSubmissionInsightNotes(): void
 
     public function testSubmissionInsightTest(): void
     {
-        $rep = dirname(__FILE__) . '/data/InsightExperimentalExample';
+        $rep = __DIR__ . '/data/InsightExperimentalExample';
         $file = "$rep/Insight_Experimental_Test.xml";
         if (!$this->submission('InsightExample', $file)) {
             return;
diff --git a/app/cdash/tests/test_projectxmlsequence.php b/app/cdash/tests/test_projectxmlsequence.php
index c2c2d3867e..b981865095 100644
--- a/app/cdash/tests/test_projectxmlsequence.php
+++ b/app/cdash/tests/test_projectxmlsequence.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 require_once 'tests/kwtest/kw_unlink.php';
 
@@ -17,7 +17,7 @@ public function __construct()
 
     public function submitFile($filename)
     {
-        $file = dirname(__FILE__) . "/data/ProjectXmlSequence/$filename";
+        $file = __DIR__ . "/data/ProjectXmlSequence/$filename";
 
         if (!$this->submission('SubProjectExample', $file)) {
             return false;
diff --git a/app/cdash/tests/test_putdynamicbuilds.php b/app/cdash/tests/test_putdynamicbuilds.php
index 544dbb2a95..9bf1f8d0c0 100644
--- a/app/cdash/tests/test_putdynamicbuilds.php
+++ b/app/cdash/tests/test_putdynamicbuilds.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Models\Site;
 use CDash\Database;
diff --git a/app/cdash/tests/test_querytests.php b/app/cdash/tests/test_querytests.php
index a796518bc5..7e06edbaed 100644
--- a/app/cdash/tests/test_querytests.php
+++ b/app/cdash/tests/test_querytests.php
@@ -6,7 +6,7 @@
 //
 use Illuminate\Support\Facades\DB;
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class QueryTestsTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/test_querytestsfilterlabels.php b/app/cdash/tests/test_querytestsfilterlabels.php
index 3b701f8a7b..284d1706ec 100644
--- a/app/cdash/tests/test_querytestsfilterlabels.php
+++ b/app/cdash/tests/test_querytestsfilterlabels.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Model\Project;
 use Illuminate\Support\Facades\DB;
@@ -36,7 +36,7 @@ public function testQueryTestsFilterLabels(): void
         $this->project->Fill();
 
         // Submit our testing data.
-        $dir = dirname(__FILE__) . '/data/QueryTestsFilterLabels';
+        $dir = __DIR__ . '/data/QueryTestsFilterLabels';
         $files = ['Test_1.xml', 'Test_2.xml'];
         foreach ($files as $file) {
             if (!$this->submission('QueryTestsFilterLabels', "{$dir}/{$file}")) {
diff --git a/app/cdash/tests/test_querytestsrevisionfilter.php b/app/cdash/tests/test_querytestsrevisionfilter.php
index b45af6a189..bc236f4e34 100644
--- a/app/cdash/tests/test_querytestsrevisionfilter.php
+++ b/app/cdash/tests/test_querytestsrevisionfilter.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class QueryTestsFilterLabelsTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/test_recoverpassword.php b/app/cdash/tests/test_recoverpassword.php
index 721a0953a5..f5ea8c105f 100644
--- a/app/cdash/tests/test_recoverpassword.php
+++ b/app/cdash/tests/test_recoverpassword.php
@@ -7,7 +7,7 @@
 use App\Models\User;
 use Illuminate\Support\Carbon;
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class RecoverPasswordTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/test_redundanttests.php b/app/cdash/tests/test_redundanttests.php
index 96f4e0e28c..0fd5be008b 100644
--- a/app/cdash/tests/test_redundanttests.php
+++ b/app/cdash/tests/test_redundanttests.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Model\Project;
 use GuzzleHttp\Exception\ClientException;
@@ -55,7 +55,7 @@ public function testRedundantTests()
         }
 
         // Submit our testing data.
-        if (!$this->submission('RedundantTests', dirname(__FILE__) . '/data/RedundantTests/Test.xml')) {
+        if (!$this->submission('RedundantTests', __DIR__ . '/data/RedundantTests/Test.xml')) {
             $this->fail('Failed to submit');
         }
 
diff --git a/app/cdash/tests/test_removebuilds.php b/app/cdash/tests/test_removebuilds.php
index 0a084ce132..06a6f887f7 100644
--- a/app/cdash/tests/test_removebuilds.php
+++ b/app/cdash/tests/test_removebuilds.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Models\BuildUpdateFile;
 use App\Models\DynamicAnalysisDefect;
@@ -305,7 +305,7 @@ public function testBuildRemovalWorksAsExpected(): void
         $image2 = new Image();
         $image2->Extension = 'image/gif';
         $image2->Name = 'smile.gif';
-        $image2->Data = base64_encode(file_get_contents(dirname(__FILE__) . '/data/smile.gif'));
+        $image2->Data = base64_encode(file_get_contents(__DIR__ . '/data/smile.gif'));
         $test_creator2->images->push($image2);
 
         $test_creator2->labels->push($label);
@@ -316,7 +316,7 @@ public function testBuildRemovalWorksAsExpected(): void
         $test_creator2->create($existing_build);
 
         // UploadFile
-        $filename = dirname(__FILE__) . '/data/smile.gif';
+        $filename = __DIR__ . '/data/smile.gif';
         $upload1 = new UploadFile();
         $upload1->filename = $filename;
         $upload1->isurl = false;
@@ -325,7 +325,7 @@ public function testBuildRemovalWorksAsExpected(): void
         $upload1->save();
         $upload1->builds()->attach((int) $build->Id);
 
-        $filename = dirname(__FILE__) . '/data/smile2.gif';
+        $filename = __DIR__ . '/data/smile2.gif';
         $upload2 = new UploadFile();
         $upload2->filename = $filename;
         $upload2->isurl = false;
diff --git a/app/cdash/tests/test_replacebuild.php b/app/cdash/tests/test_replacebuild.php
index 09a240ea7f..7fbcb23cf4 100644
--- a/app/cdash/tests/test_replacebuild.php
+++ b/app/cdash/tests/test_replacebuild.php
@@ -7,7 +7,7 @@
 use App\Utils\DatabaseCleanupUtils;
 use Illuminate\Support\Facades\DB;
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class ReplaceBuildTestCase extends KWWebTestCase
 {
@@ -25,7 +25,7 @@ public function testReplaceBuild()
         $error_msg = '';
 
         // Submit the first test file.
-        $rep = dirname(__FILE__) . '/data/ReplaceBuild';
+        $rep = __DIR__ . '/data/ReplaceBuild';
         if (!$this->submission('EmailProjectExample', "$rep/Build_1.xml")) {
             $this->fail('failed to submit Build_1.xml');
             return 1;
diff --git a/app/cdash/tests/test_revisionfilteracrossdates.php b/app/cdash/tests/test_revisionfilteracrossdates.php
index 9482e7009b..943a138d38 100644
--- a/app/cdash/tests/test_revisionfilteracrossdates.php
+++ b/app/cdash/tests/test_revisionfilteracrossdates.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class RevisionFilterIgnoresDateTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/test_seconds_from_interval.php b/app/cdash/tests/test_seconds_from_interval.php
index 2465b1e47d..d267b125b2 100644
--- a/app/cdash/tests/test_seconds_from_interval.php
+++ b/app/cdash/tests/test_seconds_from_interval.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class SecondsFromIntervalTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/test_sequenceindependence.php b/app/cdash/tests/test_sequenceindependence.php
index c46e190fe7..e4fdc98528 100644
--- a/app/cdash/tests/test_sequenceindependence.php
+++ b/app/cdash/tests/test_sequenceindependence.php
@@ -6,7 +6,7 @@
 //
 use Illuminate\Support\Facades\DB;
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class SequenceIndependenceTestCase extends KWWebTestCase
 {
@@ -190,7 +190,7 @@ public function SubmitFiles($file_order)
         }
 
         // Submit the files in the order specified.
-        $rep = dirname(__FILE__) . '/data/InsightExperimentalExample';
+        $rep = __DIR__ . '/data/InsightExperimentalExample';
         foreach ($file_order as $type) {
             $file = "$rep/Insight_Experimental_$type.xml";
             if (!$this->submission('InsightExample', $file)) {
diff --git a/app/cdash/tests/test_starttimefromnotes.php b/app/cdash/tests/test_starttimefromnotes.php
index 5dbaad8283..5584b9de95 100644
--- a/app/cdash/tests/test_starttimefromnotes.php
+++ b/app/cdash/tests/test_starttimefromnotes.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Model\Build;
 use CDash\Model\Project;
@@ -37,7 +37,7 @@ public function testStartTimeFromNotes(): void
         $this->project->Fill();
 
         // Submit our testing data.
-        $file = dirname(__FILE__) . '/data/StartTimeFromNotes/Notes.xml';
+        $file = __DIR__ . '/data/StartTimeFromNotes/Notes.xml';
         if (!$this->submission('StartTimeFromNotes', $file)) {
             $this->fail("Failed to submit {$file}");
         }
diff --git a/app/cdash/tests/test_starttimefromupload.php b/app/cdash/tests/test_starttimefromupload.php
index 15574641ed..a6e3adb3df 100644
--- a/app/cdash/tests/test_starttimefromupload.php
+++ b/app/cdash/tests/test_starttimefromupload.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Model\Build;
 use CDash\Model\Project;
@@ -36,7 +36,7 @@ public function testStartTimeFromUpload(): void
         $this->project->Fill();
 
         // Submit our testing data.
-        $file = dirname(__FILE__) . '/data/StartTimeFromUpload/Upload.xml';
+        $file = __DIR__ . '/data/StartTimeFromUpload/Upload.xml';
         if (!$this->submission('StartTimeFromUpload', $file)) {
             $this->fail("Failed to submit {$file}");
         }
diff --git a/app/cdash/tests/test_submission_assign_buildid.php b/app/cdash/tests/test_submission_assign_buildid.php
index f3edd3556b..4b1b1d907c 100644
--- a/app/cdash/tests/test_submission_assign_buildid.php
+++ b/app/cdash/tests/test_submission_assign_buildid.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Utils\DatabaseCleanupUtils;
 use CDash\Model\Build;
@@ -10,7 +10,7 @@ class SubmissionAssignBuildIdTestCase extends KWWebTestCase
     public function testSubmissionAssignBuildId(): void
     {
         $begin_test_time = time();
-        $file_to_submit = dirname(__FILE__) . '/data/AssignBuildId/Configure.xml';
+        $file_to_submit = __DIR__ . '/data/AssignBuildId/Configure.xml';
         $buildid = $this->submission_assign_buildid(
             $file_to_submit, 'InsightExample', 'assign_buildid',
             'localhost', '20180918-0100-Nightly');
diff --git a/app/cdash/tests/test_submitsortingdata.php b/app/cdash/tests/test_submitsortingdata.php
index 383e40c085..ba4e416152 100644
--- a/app/cdash/tests/test_submitsortingdata.php
+++ b/app/cdash/tests/test_submitsortingdata.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class SubmitSortingDataTestCase extends KWWebTestCase
 {
@@ -15,7 +15,7 @@ public function __construct()
 
     public function submitFile($build, $type)
     {
-        $rep = dirname(__FILE__) . '/data/SortingExample';
+        $rep = __DIR__ . '/data/SortingExample';
         $file = "$rep/$build" . '_' . "$type.xml";
         if (!$this->submission('InsightExample', $file)) {
             return false;
diff --git a/app/cdash/tests/test_subproject.php b/app/cdash/tests/test_subproject.php
index ffadd66344..224420baf9 100644
--- a/app/cdash/tests/test_subproject.php
+++ b/app/cdash/tests/test_subproject.php
@@ -36,7 +36,7 @@ public function testAccessToWebPageProjectTest(): void
     public function testSubmissionProjectDependencies(): void
     {
         $this->deleteLog($this->logfilename);
-        $rep = dirname(__FILE__) . '/data/SubProjectExample';
+        $rep = __DIR__ . '/data/SubProjectExample';
         $file = "$rep/Project_1.xml";
         if (!$this->submission('SubProjectExample', $file)) {
             return;
@@ -50,7 +50,7 @@ public function testSubmissionProjectDependencies(): void
     public function testSubmissionSubProjectBuild(): void
     {
         $this->deleteLog($this->logfilename);
-        $rep = dirname(__FILE__) . '/data/SubProjectExample';
+        $rep = __DIR__ . '/data/SubProjectExample';
         $file = "$rep/Build_1.xml";
         if (!$this->submission('SubProjectExample', $file)) {
             return;
@@ -92,7 +92,7 @@ public function testSubmissionSubProjectBuild(): void
     public function testSubmissionSubProjectTest(): void
     {
         $this->deleteLog($this->logfilename);
-        $rep = dirname(__FILE__) . '/data/SubProjectExample';
+        $rep = __DIR__ . '/data/SubProjectExample';
         $file = "$rep/Test_1.xml";
         if (!$this->submission('SubProjectExample', $file)) {
             return;
diff --git a/app/cdash/tests/test_subprojectnextprevious.php b/app/cdash/tests/test_subprojectnextprevious.php
index c3bc9ebe6d..baa5d15a12 100644
--- a/app/cdash/tests/test_subprojectnextprevious.php
+++ b/app/cdash/tests/test_subprojectnextprevious.php
@@ -7,7 +7,7 @@
 use App\Utils\DatabaseCleanupUtils;
 use Illuminate\Support\Facades\DB;
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class SubProjectNextPreviousTestCase extends KWWebTestCase
 {
@@ -31,7 +31,7 @@ public function testSubProjectNextPrevious()
             ['Build_1.xml', 'Configure_1.xml', 'Notes_1.xml', 'Test_1.xml',
                 'Build_3.xml', 'Build_2.xml', 'Configure_2.xml', 'Notes_2.xml',
                 'Test_2.xml'];
-        $dir = dirname(__FILE__) . '/data/SubProjectNextPrevious';
+        $dir = __DIR__ . '/data/SubProjectNextPrevious';
         foreach ($filesToSubmit as $file) {
             if (!$this->submission('Trilinos', "$dir/$file")) {
                 $this->fail("Failed to submit $file");
diff --git a/app/cdash/tests/test_subprojectorder.php b/app/cdash/tests/test_subprojectorder.php
index bad92c99ed..ebd166b9da 100644
--- a/app/cdash/tests/test_subprojectorder.php
+++ b/app/cdash/tests/test_subprojectorder.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Database;
 use CDash\Model\Project;
@@ -35,7 +35,7 @@ public function testSubProjectOrder(): void
         $this->project->Fill();
 
         // Submit our testing data.
-        $test_data = dirname(__FILE__) . '/data/MultipleSubprojects/Build.xml';
+        $test_data = __DIR__ . '/data/MultipleSubprojects/Build.xml';
         if (!$this->submission('SubProjectOrder', $test_data)) {
             $this->fail('failed to submit Build.xml');
         }
diff --git a/app/cdash/tests/test_subprojecttestfilters.php b/app/cdash/tests/test_subprojecttestfilters.php
index 00e5208471..4e38d7f689 100644
--- a/app/cdash/tests/test_subprojecttestfilters.php
+++ b/app/cdash/tests/test_subprojecttestfilters.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class SubProjectTestFiltersTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/test_summaryemail.php b/app/cdash/tests/test_summaryemail.php
index d26ea6620d..b7e88269e8 100644
--- a/app/cdash/tests/test_summaryemail.php
+++ b/app/cdash/tests/test_summaryemail.php
@@ -3,7 +3,7 @@
 use CDash\Model\BuildGroup;
 use CDash\Model\Project;
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class SummaryEmailTestCase extends KWWebTestCase
 {
@@ -36,7 +36,7 @@ public function testSummaryEmail(): void
         // Resubmit a previous build to this new project.
         $parts = ['build', 'update', 'test', 'dynamicanalysis'];
         foreach ($parts as $part) {
-            $file = dirname(__FILE__) . "/data/EmailProjectExample/2_$part.xml";
+            $file = __DIR__ . "/data/EmailProjectExample/2_$part.xml";
             $this->submission('SummaryEmailProject', $file);
         }
 
diff --git a/app/cdash/tests/test_testgraphpermissions.php b/app/cdash/tests/test_testgraphpermissions.php
index a439b5bf6b..6613d7f10e 100644
--- a/app/cdash/tests/test_testgraphpermissions.php
+++ b/app/cdash/tests/test_testgraphpermissions.php
@@ -6,7 +6,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class TestGraphPermissionsTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/test_testhistory.php b/app/cdash/tests/test_testhistory.php
index 92327d903d..5fa8999a3d 100644
--- a/app/cdash/tests/test_testhistory.php
+++ b/app/cdash/tests/test_testhistory.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Model\Project;
 use Illuminate\Support\Facades\DB;
@@ -236,7 +236,7 @@ public function testTestHistory(): void
         $client = $this->getGuzzleClient();
         $response = $client->request('GET', $url, ['http_errors' => false]);
         $expected = '{"tests":[{"name":"fails","summary":"Broken","summaryclass":"error"},{"name":"flaky","summary":"Unstable","summaryclass":"warning"},{"name":"notrun","summary":"Inactive","summaryclass":"warning"},{"name":"passes","summary":"Stable","summaryclass":"normal"},{"name":"sporadic","summary":"Stable","summaryclass":"normal"}]}';
-        $this->assertEqual($expected, strval($response->getBody()));
+        $this->assertEqual($expected, (string) $response->getBody());
 
         // Verify that testing history matches what we expect.
         $previous_buildids = "{$buildids[4]},+{$buildids[3]},+{$buildids[2]},+{$buildids[1]}";
diff --git a/app/cdash/tests/test_testimages.php b/app/cdash/tests/test_testimages.php
index 1567b21c95..26b7de4c78 100644
--- a/app/cdash/tests/test_testimages.php
+++ b/app/cdash/tests/test_testimages.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Models\TestImage;
 use CDash\Model\Project;
@@ -36,7 +36,7 @@ public function testTestImages(): void
         $this->project->Fill();
 
         // Submit our testing data.
-        $test_dir = dirname(__FILE__) . '/data/TestImages/';
+        $test_dir = __DIR__ . '/data/TestImages/';
         for ($i = 1; $i < 3; $i++) {
             if (!$this->submission('TestImages', "{$test_dir}/Test_{$i}.xml")) {
                 $this->fail("Failed to submit Test_{$i}.xml");
diff --git a/app/cdash/tests/test_testoverview.php b/app/cdash/tests/test_testoverview.php
index 11be17c345..4c64458173 100644
--- a/app/cdash/tests/test_testoverview.php
+++ b/app/cdash/tests/test_testoverview.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Database;
 
diff --git a/app/cdash/tests/test_timeline.php b/app/cdash/tests/test_timeline.php
index fc8f8c485e..0b41c4a103 100644
--- a/app/cdash/tests/test_timeline.php
+++ b/app/cdash/tests/test_timeline.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Database;
 use CDash\Model\Build;
@@ -62,11 +62,11 @@ public function testTimeline(): void
                     break;
                 }
             }
-            if (!is_null($build)) {
+            if (null !== $build) {
                 break;
             }
         }
-        if (is_null($build)) {
+        if (null === $build) {
             $this->fail('build lookup failed');
         }
 
diff --git a/app/cdash/tests/test_timeoutsandmissingtests.php b/app/cdash/tests/test_timeoutsandmissingtests.php
index e737a5e386..dabc1696f9 100644
--- a/app/cdash/tests/test_timeoutsandmissingtests.php
+++ b/app/cdash/tests/test_timeoutsandmissingtests.php
@@ -2,7 +2,7 @@
 
 use Illuminate\Support\Facades\DB;
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class TimeoutsAndMissingTestsTestCase extends KWWebTestCase
 {
@@ -31,7 +31,7 @@ private function getLastBuildId()
     public function testMissingTestsSummarizedInEmail(): void
     {
         $this->deleteLog($this->logfilename);
-        $rep = dirname(__FILE__) . '/data/TimeoutsAndMissingTests';
+        $rep = __DIR__ . '/data/TimeoutsAndMissingTests';
         $file = "{$rep}/5_test.xml";
 
         if (!$this->submission('EmailProjectExample', $file)) {
@@ -96,7 +96,7 @@ public function testMissingTestsSummarizedInViewTestAPI(): void
     public function testTimeoutFailuresDifferentiatedInEmail(): void
     {
         $this->deleteLog($this->logfilename);
-        $rep = dirname(__FILE__) . '/data/TimeoutsAndMissingTests';
+        $rep = __DIR__ . '/data/TimeoutsAndMissingTests';
         $file = "{$rep}/4_test.xml";
 
         if (!$this->submission('EmailProjectExample', $file)) {
diff --git a/app/cdash/tests/test_timestatus.php b/app/cdash/tests/test_timestatus.php
index 2280e3b592..81707acb21 100644
--- a/app/cdash/tests/test_timestatus.php
+++ b/app/cdash/tests/test_timestatus.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Database;
 use CDash\Model\Project;
diff --git a/app/cdash/tests/test_timesummary.php b/app/cdash/tests/test_timesummary.php
index f5fcf48fb1..76f74c5219 100644
--- a/app/cdash/tests/test_timesummary.php
+++ b/app/cdash/tests/test_timesummary.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class TimeSummaryTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/test_truncateoutput.php b/app/cdash/tests/test_truncateoutput.php
index 95f0c64a14..321b51d8bc 100644
--- a/app/cdash/tests/test_truncateoutput.php
+++ b/app/cdash/tests/test_truncateoutput.php
@@ -7,7 +7,7 @@
 use App\Utils\DatabaseCleanupUtils;
 use Illuminate\Support\Facades\DB;
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class TruncateOutputTestCase extends KWWebTestCase
 {
@@ -19,7 +19,7 @@ class TruncateOutputTestCase extends KWWebTestCase
     public function __construct()
     {
         parent::__construct();
-        $this->ConfigFile = dirname(__FILE__) . '/../../../.env';
+        $this->ConfigFile = __DIR__ . '/../../../.env';
         $this->Original = file_get_contents($this->ConfigFile);
 
         $this->Expected = "The beginning survives\n...\nCDash truncated output because it exceeded 44 characters.\n...\nThis part is preserved\n";
@@ -53,7 +53,7 @@ public function testTruncateOutput(): void
         // Set a limit that will cause our test output to be truncated.
         file_put_contents($this->ConfigFile, "LARGE_TEXT_LIMIT=44\n", FILE_APPEND | LOCK_EX);
 
-        $rep = dirname(__FILE__) . '/data/TruncateOutput';
+        $rep = __DIR__ . '/data/TruncateOutput';
         foreach (['Build_stdout.xml', 'Build_stderr.xml', 'Build_both.xml'] as $file) {
             // Submit our testing data.
             if (!$this->submission('InsightExample', "$rep/$file")) {
diff --git a/app/cdash/tests/test_uniquediffs.php b/app/cdash/tests/test_uniquediffs.php
index 1f1460524b..9a00d02efb 100644
--- a/app/cdash/tests/test_uniquediffs.php
+++ b/app/cdash/tests/test_uniquediffs.php
@@ -8,7 +8,7 @@
 use CDash\Model\Build;
 use Illuminate\Support\Facades\DB;
 
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class UniqueDiffsTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/test_unparsedsubmissionshonorbuildid.php b/app/cdash/tests/test_unparsedsubmissionshonorbuildid.php
index 93e4125e3e..91d44addc6 100644
--- a/app/cdash/tests/test_unparsedsubmissionshonorbuildid.php
+++ b/app/cdash/tests/test_unparsedsubmissionshonorbuildid.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 require_once 'tests/test_branchcoverage.php';
 
 use App\Utils\DatabaseCleanupUtils;
diff --git a/app/cdash/tests/test_updateappend.php b/app/cdash/tests/test_updateappend.php
index 8140e1b9f0..f86c454eb2 100644
--- a/app/cdash/tests/test_updateappend.php
+++ b/app/cdash/tests/test_updateappend.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Utils\DatabaseCleanupUtils;
 
@@ -23,7 +23,7 @@ public function testUpdateAppend()
         echo "1. testUpdateAppend\n";
 
         // Submit our test data.
-        $rep = dirname(__FILE__) . '/data/UpdateAppend';
+        $rep = __DIR__ . '/data/UpdateAppend';
         if (!$this->submission('EmailProjectExample', "$rep/Update_1.xml")) {
             $this->fail('failed to submit Update_1.xml');
             return 1;
diff --git a/app/cdash/tests/test_uploadfile.php b/app/cdash/tests/test_uploadfile.php
index 7ed2d54648..4cb69d238e 100644
--- a/app/cdash/tests/test_uploadfile.php
+++ b/app/cdash/tests/test_uploadfile.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Utils\SubmissionUtils;
 use Illuminate\Support\Facades\Storage;
@@ -24,7 +24,7 @@ public function __construct()
     public function testSubmitUploadXML(): void
     {
         $this->deleteLog($this->logfilename);
-        $rep = dirname(__FILE__) . '/data/EmailProjectExample';
+        $rep = __DIR__ . '/data/EmailProjectExample';
         $file = "$rep/1_upload.xml";
         if (!$this->submission('EmailProjectExample', $file)) {
             $this->fail('Failed to submit Upload.xml');
diff --git a/app/cdash/tests/test_usernotes.php b/app/cdash/tests/test_usernotes.php
index 54b5fd2085..a4ed4b13a4 100644
--- a/app/cdash/tests/test_usernotes.php
+++ b/app/cdash/tests/test_usernotes.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use CDash\Model\Project;
 use Illuminate\Support\Facades\DB;
diff --git a/app/cdash/tests/test_viewconfigure.php b/app/cdash/tests/test_viewconfigure.php
index 647f1ef863..52ccaef16d 100644
--- a/app/cdash/tests/test_viewconfigure.php
+++ b/app/cdash/tests/test_viewconfigure.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class ViewConfigureTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/test_viewdynamicanalysis.php b/app/cdash/tests/test_viewdynamicanalysis.php
index 52d36e52cf..b942681dfb 100644
--- a/app/cdash/tests/test_viewdynamicanalysis.php
+++ b/app/cdash/tests/test_viewdynamicanalysis.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class ViewDynamicAnalysisTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/test_viewdynamicanalysisfile.php b/app/cdash/tests/test_viewdynamicanalysisfile.php
index 23eec22490..54d0232a7b 100644
--- a/app/cdash/tests/test_viewdynamicanalysisfile.php
+++ b/app/cdash/tests/test_viewdynamicanalysisfile.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 use App\Utils\DatabaseCleanupUtils;
 use CDash\Database;
@@ -50,7 +50,7 @@ public function testNextPrevious(): void
 
         // Submit testing data.
         $filenames = ['previous', 'next'];
-        $rep = dirname(__FILE__) . '/data/InsightExperimentalExample';
+        $rep = __DIR__ . '/data/InsightExperimentalExample';
         foreach ($filenames as $filename) {
             $file = "$rep/$filename-DA.xml";
             if (!$this->submission('InsightExample', $file)) {
diff --git a/app/cdash/tests/test_viewsubprojects.php b/app/cdash/tests/test_viewsubprojects.php
index 6e6ac177dd..3f6c0d8c38 100644
--- a/app/cdash/tests/test_viewsubprojects.php
+++ b/app/cdash/tests/test_viewsubprojects.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class ViewSubProjectsTestCase extends KWWebTestCase
 {
@@ -18,7 +18,7 @@ public function testViewSubProjects()
         $this->get($this->url . '/api/v1/viewSubProjects.php?project=Trilinos&date=2011-07-22');
         $content = $this->getBrowser()->getContent();
         $jsonobj = json_decode($content, true);
-        if (is_null($jsonobj)) {
+        if (null === $jsonobj) {
             $this->fail("API response could be not be decoded to JSON:\n$content");
             return 1;
         }
diff --git a/app/cdash/tests/trilinos_submission_test.php b/app/cdash/tests/trilinos_submission_test.php
index d4c2926cae..18976b8b54 100644
--- a/app/cdash/tests/trilinos_submission_test.php
+++ b/app/cdash/tests/trilinos_submission_test.php
@@ -4,7 +4,7 @@
 // After including cdash_test_case.php, subsequent require_once calls are
 // relative to the top of the CDash source tree
 //
-require_once dirname(__FILE__) . '/cdash_test_case.php';
+require_once __DIR__ . '/cdash_test_case.php';
 
 class TrilinosSubmissionTestCase extends KWWebTestCase
 {
@@ -15,7 +15,7 @@ public function __construct()
 
     public function submitFiles($test, $trilinosOnly = false)
     {
-        $dir = str_replace('\\', '/', dirname(__FILE__) . "/data/$test");
+        $dir = str_replace('\\', '/', __DIR__ . "/data/$test");
 
         $listfilename = $dir . '/orderedFileList.txt';
 
@@ -80,7 +80,7 @@ public function verifyResults()
                 $parent_build = $build;
             }
         }
-        if (is_null($parent_build)) {
+        if (null === $parent_build) {
             $this->fail('Could not find expected parent build');
             return false;
         }
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index e513d6952e..1aefe5f0be 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -390,6 +390,12 @@ parameters:
 			count: 1
 			path: app/Http/Controllers/AbstractProjectController.php
 
+		-
+			rawMessage: Cannot cast mixed to int.
+			identifier: cast.int
+			count: 8
+			path: app/Http/Controllers/AdminController.php
+
 		-
 			rawMessage: 'Construct empty() is not allowed. Use more strict comparison.'
 			identifier: empty.notAllowed
@@ -402,12 +408,6 @@ parameters:
 			count: 1
 			path: app/Http/Controllers/AdminController.php
 
-		-
-			rawMessage: 'Parameter #1 $value of function intval expects array|bool|float|int|resource|string|null, mixed given.'
-			identifier: argument.type
-			count: 8
-			path: app/Http/Controllers/AdminController.php
-
 		-
 			rawMessage: 'Parameter #2 $timestamp of function date expects int|null, (int|false) given.'
 			identifier: argument.type
@@ -493,13 +493,13 @@ parameters:
 			path: app/Http/Controllers/AuthTokenController.php
 
 		-
-			rawMessage: 'Parameter #1 $user_id of static method App\Utils\AuthTokenUtil::generateToken() expects int, int|string|null given.'
-			identifier: argument.type
+			rawMessage: Cannot cast mixed to int.
+			identifier: cast.int
 			count: 1
 			path: app/Http/Controllers/AuthTokenController.php
 
 		-
-			rawMessage: 'Parameter #1 $value of function intval expects array|bool|float|int|resource|string|null, mixed given.'
+			rawMessage: 'Parameter #1 $user_id of static method App\Utils\AuthTokenUtil::generateToken() expects int, int|string|null given.'
 			identifier: argument.type
 			count: 1
 			path: app/Http/Controllers/AuthTokenController.php
@@ -633,7 +633,7 @@ parameters:
 		-
 			rawMessage: Cannot cast mixed to int.
 			identifier: cast.int
-			count: 3
+			count: 11
 			path: app/Http/Controllers/BuildController.php
 
 		-
@@ -768,12 +768,6 @@ parameters:
 			count: 4
 			path: app/Http/Controllers/BuildController.php
 
-		-
-			rawMessage: 'Parameter #1 $value of function intval expects array|bool|float|int|resource|string|null, mixed given.'
-			identifier: argument.type
-			count: 8
-			path: app/Http/Controllers/BuildController.php
-
 		-
 			rawMessage: 'Parameter #2 $timestamp of function date expects int|null, int|false given.'
 			identifier: argument.type
@@ -817,8 +811,8 @@ parameters:
 			path: app/Http/Controllers/BuildNoteController.php
 
 		-
-			rawMessage: 'Parameter #1 $value of function intval expects array|bool|float|int|resource|string|null, mixed given.'
-			identifier: argument.type
+			rawMessage: Cannot cast mixed to int.
+			identifier: cast.int
 			count: 1
 			path: app/Http/Controllers/BuildNoteController.php
 
@@ -1200,7 +1194,19 @@ parameters:
 		-
 			rawMessage: Cannot cast mixed to int.
 			identifier: cast.int
-			count: 12
+			count: 19
+			path: app/Http/Controllers/CoverageController.php
+
+		-
+			rawMessage: Casting to int something that's already int.
+			identifier: cast.useless
+			count: 1
+			path: app/Http/Controllers/CoverageController.php
+
+		-
+			rawMessage: 'Casting to int something that''s already int<1, max>.'
+			identifier: cast.useless
+			count: 1
 			path: app/Http/Controllers/CoverageController.php
 
 		-
@@ -1455,12 +1461,6 @@ parameters:
 			count: 2
 			path: app/Http/Controllers/CoverageController.php
 
-		-
-			rawMessage: 'Parameter #1 $value of function intval expects array|bool|float|int|resource|string|null, mixed given.'
-			identifier: argument.type
-			count: 7
-			path: app/Http/Controllers/CoverageController.php
-
 		-
 			rawMessage: 'Parameter #2 $build_array of static method App\Http\Controllers\CoverageController::apiCompareCoverage_get_build_label() expects array<string, mixed>, mixed given.'
 			identifier: argument.type
@@ -1690,14 +1690,14 @@ parameters:
 			path: app/Http/Controllers/OAuthController.php
 
 		-
-			rawMessage: 'Loose comparison via "==" is not allowed.'
-			identifier: equal.notAllowed
+			rawMessage: Cannot cast mixed to int.
+			identifier: cast.int
 			count: 1
 			path: app/Http/Controllers/ProjectController.php
 
 		-
-			rawMessage: 'Parameter #1 $value of function intval expects array|bool|float|int|resource|string|null, mixed given.'
-			identifier: argument.type
+			rawMessage: 'Loose comparison via "==" is not allowed.'
+			identifier: equal.notAllowed
 			count: 1
 			path: app/Http/Controllers/ProjectController.php
 
@@ -1779,6 +1779,12 @@ parameters:
 			count: 1
 			path: app/Http/Controllers/ProjectOverviewController.php
 
+		-
+			rawMessage: Cannot cast mixed to int.
+			identifier: cast.int
+			count: 3
+			path: app/Http/Controllers/ProjectOverviewController.php
+
 		-
 			rawMessage: 'Construct empty() is not allowed. Use more strict comparison.'
 			identifier: empty.notAllowed
@@ -2145,12 +2151,6 @@ parameters:
 			count: 1
 			path: app/Http/Controllers/ProjectOverviewController.php
 
-		-
-			rawMessage: 'Parameter #1 $value of function intval expects array|bool|float|int|resource|string|null, mixed given.'
-			identifier: argument.type
-			count: 3
-			path: app/Http/Controllers/ProjectOverviewController.php
-
 		-
 			rawMessage: 'Parameter #2 $timestamp of function gmdate expects int|null, (float|int) given.'
 			identifier: argument.type
@@ -2271,6 +2271,12 @@ parameters:
 			count: 1
 			path: app/Http/Controllers/SubProjectController.php
 
+		-
+			rawMessage: Cannot cast mixed to int.
+			identifier: cast.int
+			count: 1
+			path: app/Http/Controllers/SubProjectController.php
+
 		-
 			rawMessage: 'Construct empty() is not allowed. Use more strict comparison.'
 			identifier: empty.notAllowed
@@ -2301,12 +2307,6 @@ parameters:
 			count: 1
 			path: app/Http/Controllers/SubProjectController.php
 
-		-
-			rawMessage: 'Parameter #1 $value of function intval expects array|bool|float|int|resource|string|null, mixed given.'
-			identifier: argument.type
-			count: 1
-			path: app/Http/Controllers/SubProjectController.php
-
 		-
 			rawMessage: 'Parameter #2 $timestamp of function gmdate expects int|null, (float|int) given.'
 			identifier: argument.type
@@ -2364,6 +2364,12 @@ parameters:
 			count: 1
 			path: app/Http/Controllers/SubscribeProjectController.php
 
+		-
+			rawMessage: Cannot cast mixed to int.
+			identifier: cast.int
+			count: 6
+			path: app/Http/Controllers/SubscribeProjectController.php
+
 		-
 			rawMessage: 'Construct empty() is not allowed. Use more strict comparison.'
 			identifier: empty.notAllowed
@@ -2376,12 +2382,6 @@ parameters:
 			count: 1
 			path: app/Http/Controllers/SubscribeProjectController.php
 
-		-
-			rawMessage: 'Parameter #1 $value of function intval expects array|bool|float|int|resource|string|null, mixed given.'
-			identifier: argument.type
-			count: 6
-			path: app/Http/Controllers/SubscribeProjectController.php
-
 		-
 			rawMessage: 'Binary operation "." between mixed and ''&export=csv'' results in an error.'
 			identifier: binaryOp.invalid
@@ -2409,6 +2409,12 @@ parameters:
 		-
 			rawMessage: Cannot cast mixed to int.
 			identifier: cast.int
+			count: 2
+			path: app/Http/Controllers/TestController.php
+
+		-
+			rawMessage: Casting to float something that's already float.
+			identifier: cast.useless
 			count: 1
 			path: app/Http/Controllers/TestController.php
 
@@ -2430,12 +2436,6 @@ parameters:
 			count: 1
 			path: app/Http/Controllers/TestController.php
 
-		-
-			rawMessage: 'Parameter #1 $value of function intval expects array|bool|float|int|resource|string|null, mixed given.'
-			identifier: argument.type
-			count: 1
-			path: app/Http/Controllers/TestController.php
-
 		-
 			rawMessage: 'Parameter #2 $timestamp of function date expects int|null, (float|int) given.'
 			identifier: argument.type
@@ -2559,6 +2559,12 @@ parameters:
 		-
 			rawMessage: Cannot cast mixed to int.
 			identifier: cast.int
+			count: 2
+			path: app/Http/Controllers/UserController.php
+
+		-
+			rawMessage: Casting to int something that's already int.
+			identifier: cast.useless
 			count: 1
 			path: app/Http/Controllers/UserController.php
 
@@ -2628,12 +2634,6 @@ parameters:
 			count: 4
 			path: app/Http/Controllers/UserController.php
 
-		-
-			rawMessage: 'Parameter #1 $value of function intval expects array|bool|float|int|resource|string|null, mixed given.'
-			identifier: argument.type
-			count: 1
-			path: app/Http/Controllers/UserController.php
-
 		-
 			rawMessage: 'Parameter #2 $timestamp of function date expects int|null, (int|false) given.'
 			identifier: argument.type
@@ -2658,12 +2658,6 @@ parameters:
 			count: 2
 			path: app/Http/Controllers/UserNoteController.php
 
-		-
-			rawMessage: 'Call to function is_null() with string will always evaluate to false.'
-			identifier: function.impossibleType
-			count: 1
-			path: app/Http/Controllers/ViewTestController.php
-
 		-
 			rawMessage: 'Method App\Http\Controllers\ViewTestController::get_int_param() has parameter $name with no type specified.'
 			identifier: missingType.parameter
@@ -2688,6 +2682,12 @@ parameters:
 			count: 1
 			path: app/Http/Controllers/ViewTestController.php
 
+		-
+			rawMessage: 'Strict comparison using === between null and string will always evaluate to false.'
+			identifier: identical.alwaysFalse
+			count: 1
+			path: app/Http/Controllers/ViewTestController.php
+
 		-
 			rawMessage: 'PHPDoc type array of property App\Http\Kernel::$middleware is not the same as PHPDoc type array<int, string> of overridden property Illuminate\Foundation\Http\Kernel::$middleware.'
 			identifier: property.phpDocType
@@ -4876,14 +4876,14 @@ parameters:
 			path: app/Http/Submission/Handlers/OpenCoverTarHandler.php
 
 		-
-			rawMessage: 'Only booleans are allowed in or, int|false given on the left side.'
-			identifier: logicalOr.leftNotBoolean
+			rawMessage: 'Only booleans are allowed in ||, int|false given on the left side.'
+			identifier: booleanOr.leftNotBoolean
 			count: 1
 			path: app/Http/Submission/Handlers/OpenCoverTarHandler.php
 
 		-
-			rawMessage: 'Only booleans are allowed in or, int|false given on the right side.'
-			identifier: logicalOr.rightNotBoolean
+			rawMessage: 'Only booleans are allowed in ||, int|false given on the right side.'
+			identifier: booleanOr.rightNotBoolean
 			count: 7
 			path: app/Http/Submission/Handlers/OpenCoverTarHandler.php
 
@@ -6210,6 +6210,12 @@ parameters:
 			count: 1
 			path: app/Utils/AuthTokenUtil.php
 
+		-
+			rawMessage: Casting to int something that's already int.
+			identifier: cast.useless
+			count: 1
+			path: app/Utils/DatabaseCleanupUtils.php
+
 		-
 			rawMessage: 'Construct empty() is not allowed. Use more strict comparison.'
 			identifier: empty.notAllowed
@@ -8349,6 +8355,12 @@ parameters:
 			count: 1
 			path: app/cdash/app/Controller/Api/TestOverview.php
 
+		-
+			rawMessage: Cannot cast mixed to int.
+			identifier: cast.int
+			count: 1
+			path: app/cdash/app/Controller/Api/TestOverview.php
+
 		-
 			rawMessage: Implicit array creation is not allowed - variable $tests_response does not exist.
 			identifier: variable.implicitArray
@@ -8373,12 +8385,6 @@ parameters:
 			count: 1
 			path: app/cdash/app/Controller/Api/TestOverview.php
 
-		-
-			rawMessage: 'Parameter #1 $value of function intval expects array|bool|float|int|resource|string|null, mixed given.'
-			identifier: argument.type
-			count: 1
-			path: app/cdash/app/Controller/Api/TestOverview.php
-
 		-
 			rawMessage: Short ternary operator is not allowed. Use null coalesce operator if applicable or consider using long ternary.
 			identifier: ternary.shortNotAllowed
@@ -9207,6 +9213,12 @@ parameters:
 			count: 1
 			path: app/cdash/app/Model/Build.php
 
+		-
+			rawMessage: 'Casting to int something that''s already int<1, max>.'
+			identifier: cast.useless
+			count: 1
+			path: app/cdash/app/Model/Build.php
+
 		-
 			rawMessage: Class CDash\Model\Build has an uninitialized property $BeginningOfDay. Give it default value or assign it in the constructor.
 			identifier: property.uninitialized
@@ -10998,6 +11010,12 @@ parameters:
 			count: 3
 			path: app/cdash/app/Model/CoverageSummary.php
 
+		-
+			rawMessage: 'Casting to int something that''s already int<1, max>.'
+			identifier: cast.useless
+			count: 1
+			path: app/cdash/app/Model/CoverageSummary.php
+
 		-
 			rawMessage: 'Construct empty() is not allowed. Use more strict comparison.'
 			identifier: empty.notAllowed
@@ -11739,6 +11757,18 @@ parameters:
 			count: 1
 			path: app/cdash/app/Model/SubProject.php
 
+		-
+			rawMessage: Casting to int something that's already int.
+			identifier: cast.useless
+			count: 1
+			path: app/cdash/app/Model/SubProject.php
+
+		-
+			rawMessage: 'Casting to int something that''s already int<min, -1>|int<1, max>.'
+			identifier: cast.useless
+			count: 1
+			path: app/cdash/app/Model/SubProject.php
+
 		-
 			rawMessage: 'Loose comparison via "!=" is not allowed.'
 			identifier: notEqual.notAllowed
@@ -12148,14 +12178,14 @@ parameters:
 			path: app/cdash/include/Collection/BuildEmailCollection.php
 
 		-
-			rawMessage: 'Cannot call method add() on mixed.'
-			identifier: method.nonObject
+			rawMessage: Cannot access an offset on mixed.
+			identifier: offsetAccess.nonOffsetAccessible
 			count: 1
 			path: app/cdash/include/Collection/BuildEmailCollection.php
 
 		-
-			rawMessage: 'Parameter #1 $array of function array_push expects array, mixed given.'
-			identifier: argument.type
+			rawMessage: 'Cannot call method add() on mixed.'
+			identifier: method.nonObject
 			count: 1
 			path: app/cdash/include/Collection/BuildEmailCollection.php
 
@@ -14097,6 +14127,12 @@ parameters:
 			count: 1
 			path: app/cdash/include/common.php
 
+		-
+			rawMessage: Casting to int something that's already int.
+			identifier: cast.useless
+			count: 1
+			path: app/cdash/include/common.php
+
 		-
 			rawMessage: Casting to string something that's already string.
 			identifier: cast.useless
@@ -14457,12 +14493,6 @@ parameters:
 			count: 1
 			path: app/cdash/include/common.php
 
-		-
-			rawMessage: 'Parameter #1 $haystack of function stripos expects string, float|int|string given.'
-			identifier: argument.type
-			count: 1
-			path: app/cdash/include/common.php
-
 		-
 			rawMessage: 'Parameter #1 $num of function is_infinite expects float, float|int|string given.'
 			identifier: argument.type
@@ -14493,6 +14523,12 @@ parameters:
 			count: 1
 			path: app/cdash/include/common.php
 
+		-
+			rawMessage: 'Parameter #1 $string of function strtolower expects string, float|int|string given.'
+			identifier: argument.type
+			count: 1
+			path: app/cdash/include/common.php
+
 		-
 			rawMessage: 'Parameter #1 $string of function substr expects string, (string|false) given.'
 			identifier: argument.type
@@ -14625,7 +14661,7 @@ parameters:
 		-
 			rawMessage: Cannot cast mixed to int.
 			identifier: cast.int
-			count: 2
+			count: 6
 			path: app/cdash/include/filterdataFunctions.php
 
 		-
@@ -14982,12 +15018,6 @@ parameters:
 			count: 1
 			path: app/cdash/include/filterdataFunctions.php
 
-		-
-			rawMessage: 'Parameter #1 $value of function intval expects array|bool|float|int|resource|string|null, mixed given.'
-			identifier: argument.type
-			count: 4
-			path: app/cdash/include/filterdataFunctions.php
-
 		-
 			rawMessage: 'Parameter #2 $timestamp of function gmdate expects int|null, (int|false) given.'
 			identifier: argument.type
diff --git a/tests/Feature/GraphQL/BuildCommandTypeTest.php b/tests/Feature/GraphQL/BuildCommandTypeTest.php
index c73d93af38..10b01df447 100644
--- a/tests/Feature/GraphQL/BuildCommandTypeTest.php
+++ b/tests/Feature/GraphQL/BuildCommandTypeTest.php
@@ -15,8 +15,8 @@
 
 class BuildCommandTypeTest extends TestCase
 {
-    use CreatesUsers;
     use CreatesProjects;
+    use CreatesUsers;
 
     private Project $project;
 
diff --git a/tests/Feature/GraphQL/BuildMeasurementTypeTest.php b/tests/Feature/GraphQL/BuildMeasurementTypeTest.php
index 716909689c..a4939d7ddf 100644
--- a/tests/Feature/GraphQL/BuildMeasurementTypeTest.php
+++ b/tests/Feature/GraphQL/BuildMeasurementTypeTest.php
@@ -10,8 +10,8 @@
 
 class BuildMeasurementTypeTest extends TestCase
 {
-    use CreatesUsers;
     use CreatesProjects;
+    use CreatesUsers;
 
     private Project $project;
 
diff --git a/tests/Feature/GraphQL/BuildTypeTest.php b/tests/Feature/GraphQL/BuildTypeTest.php
index 90ae3e9a2c..879ed82021 100644
--- a/tests/Feature/GraphQL/BuildTypeTest.php
+++ b/tests/Feature/GraphQL/BuildTypeTest.php
@@ -17,8 +17,8 @@
 
 class BuildTypeTest extends TestCase
 {
-    use CreatesUsers;
     use CreatesProjects;
+    use CreatesUsers;
 
     private Project $project;
     private Project $project2;
diff --git a/tests/Feature/GraphQL/ConfigureTypeTest.php b/tests/Feature/GraphQL/ConfigureTypeTest.php
index 6adead994f..4a2c177235 100644
--- a/tests/Feature/GraphQL/ConfigureTypeTest.php
+++ b/tests/Feature/GraphQL/ConfigureTypeTest.php
@@ -13,8 +13,8 @@
 
 class ConfigureTypeTest extends TestCase
 {
-    use CreatesUsers;
     use CreatesProjects;
+    use CreatesUsers;
 
     private Project $project;
 
diff --git a/tests/Feature/GraphQL/CoverageTypeTest.php b/tests/Feature/GraphQL/CoverageTypeTest.php
index a95e44e4ab..06f18022d2 100644
--- a/tests/Feature/GraphQL/CoverageTypeTest.php
+++ b/tests/Feature/GraphQL/CoverageTypeTest.php
@@ -14,8 +14,8 @@
 
 class CoverageTypeTest extends TestCase
 {
-    use CreatesUsers;
     use CreatesProjects;
+    use CreatesUsers;
 
     private Project $project;
 
diff --git a/tests/Feature/GraphQL/FilterTest.php b/tests/Feature/GraphQL/FilterTest.php
index 1dd0a77cc3..8ead0eec3f 100644
--- a/tests/Feature/GraphQL/FilterTest.php
+++ b/tests/Feature/GraphQL/FilterTest.php
@@ -17,8 +17,8 @@
 class FilterTest extends TestCase
 {
     use CreatesProjects;
-    use CreatesUsers;
     use CreatesSites;
+    use CreatesUsers;
     use DatabaseTruncation;
 
     /**
diff --git a/tests/Feature/GraphQL/LabelTypeTest.php b/tests/Feature/GraphQL/LabelTypeTest.php
index 01f26823f5..8fef56bf99 100644
--- a/tests/Feature/GraphQL/LabelTypeTest.php
+++ b/tests/Feature/GraphQL/LabelTypeTest.php
@@ -12,8 +12,8 @@
 
 class LabelTypeTest extends TestCase
 {
-    use CreatesUsers;
     use CreatesProjects;
+    use CreatesUsers;
 
     private Project $project;
 
diff --git a/tests/Feature/GraphQL/Mutations/ChangeProjectRoleTest.php b/tests/Feature/GraphQL/Mutations/ChangeProjectRoleTest.php
index 59f96dcf2d..9d2246126e 100644
--- a/tests/Feature/GraphQL/Mutations/ChangeProjectRoleTest.php
+++ b/tests/Feature/GraphQL/Mutations/ChangeProjectRoleTest.php
@@ -11,8 +11,8 @@
 
 class ChangeProjectRoleTest extends TestCase
 {
-    use CreatesUsers;
     use CreatesProjects;
+    use CreatesUsers;
 
     private Project $project;
 
diff --git a/tests/Feature/GraphQL/Mutations/InviteToProjectTest.php b/tests/Feature/GraphQL/Mutations/InviteToProjectTest.php
index 81965dc058..28ec91450e 100644
--- a/tests/Feature/GraphQL/Mutations/InviteToProjectTest.php
+++ b/tests/Feature/GraphQL/Mutations/InviteToProjectTest.php
@@ -15,8 +15,8 @@
 
 class InviteToProjectTest extends TestCase
 {
-    use CreatesUsers;
     use CreatesProjects;
+    use CreatesUsers;
 
     private Project $project;
 
diff --git a/tests/Feature/GraphQL/Mutations/JoinProjectTest.php b/tests/Feature/GraphQL/Mutations/JoinProjectTest.php
index acdcb20e0d..1574c29ccd 100644
--- a/tests/Feature/GraphQL/Mutations/JoinProjectTest.php
+++ b/tests/Feature/GraphQL/Mutations/JoinProjectTest.php
@@ -10,8 +10,8 @@
 
 class JoinProjectTest extends TestCase
 {
-    use CreatesUsers;
     use CreatesProjects;
+    use CreatesUsers;
 
     private ?Project $project = null;
 
diff --git a/tests/Feature/GraphQL/Mutations/RemoveProjectUserTest.php b/tests/Feature/GraphQL/Mutations/RemoveProjectUserTest.php
index 3562eb4bb6..ae29f9a28b 100644
--- a/tests/Feature/GraphQL/Mutations/RemoveProjectUserTest.php
+++ b/tests/Feature/GraphQL/Mutations/RemoveProjectUserTest.php
@@ -11,8 +11,8 @@
 
 class RemoveProjectUserTest extends TestCase
 {
-    use CreatesUsers;
     use CreatesProjects;
+    use CreatesUsers;
 
     private Project $project;
 
diff --git a/tests/Feature/GraphQL/Mutations/RevokeProjectInvitationTest.php b/tests/Feature/GraphQL/Mutations/RevokeProjectInvitationTest.php
index 572505fb9e..62ba3aebd7 100644
--- a/tests/Feature/GraphQL/Mutations/RevokeProjectInvitationTest.php
+++ b/tests/Feature/GraphQL/Mutations/RevokeProjectInvitationTest.php
@@ -13,8 +13,8 @@
 
 class RevokeProjectInvitationTest extends TestCase
 {
-    use CreatesUsers;
     use CreatesProjects;
+    use CreatesUsers;
 
     private Project $project;
 
diff --git a/tests/Feature/GraphQL/Mutations/UpdateSiteDescriptionTest.php b/tests/Feature/GraphQL/Mutations/UpdateSiteDescriptionTest.php
index b671eaf4cb..593366fb99 100644
--- a/tests/Feature/GraphQL/Mutations/UpdateSiteDescriptionTest.php
+++ b/tests/Feature/GraphQL/Mutations/UpdateSiteDescriptionTest.php
@@ -12,8 +12,8 @@
 
 class UpdateSiteDescriptionTest extends TestCase
 {
-    use CreatesUsers;
     use CreatesSites;
+    use CreatesUsers;
 
     private Site $site;
 
diff --git a/tests/Feature/GraphQL/NoteTypeTest.php b/tests/Feature/GraphQL/NoteTypeTest.php
index 5219fd49de..7120d0515a 100644
--- a/tests/Feature/GraphQL/NoteTypeTest.php
+++ b/tests/Feature/GraphQL/NoteTypeTest.php
@@ -12,8 +12,8 @@
 
 class NoteTypeTest extends TestCase
 {
-    use CreatesUsers;
     use CreatesProjects;
+    use CreatesUsers;
 
     private Project $public_project;
     private Project $private_project;
diff --git a/tests/Feature/GraphQL/ProjectInvitationTypeTest.php b/tests/Feature/GraphQL/ProjectInvitationTypeTest.php
index be36fa27b9..9b2acbe305 100644
--- a/tests/Feature/GraphQL/ProjectInvitationTypeTest.php
+++ b/tests/Feature/GraphQL/ProjectInvitationTypeTest.php
@@ -13,8 +13,8 @@
 
 class ProjectInvitationTypeTest extends TestCase
 {
-    use CreatesUsers;
     use CreatesProjects;
+    use CreatesUsers;
 
     private Project $project;
     private User $normalUser;
diff --git a/tests/Feature/GraphQL/ProjectTypeTest.php b/tests/Feature/GraphQL/ProjectTypeTest.php
index ad7635aedd..e4ea1535e6 100644
--- a/tests/Feature/GraphQL/ProjectTypeTest.php
+++ b/tests/Feature/GraphQL/ProjectTypeTest.php
@@ -14,8 +14,8 @@
 
 class ProjectTypeTest extends TestCase
 {
-    use CreatesUsers;
     use CreatesProjects;
+    use CreatesUsers;
     use DatabaseTruncation;
 
     /**
diff --git a/tests/Feature/GraphQL/SiteTypeTest.php b/tests/Feature/GraphQL/SiteTypeTest.php
index 2c06099379..64ac355c40 100644
--- a/tests/Feature/GraphQL/SiteTypeTest.php
+++ b/tests/Feature/GraphQL/SiteTypeTest.php
@@ -16,9 +16,9 @@
 
 class SiteTypeTest extends TestCase
 {
-    use CreatesUsers;
     use CreatesProjects;
     use CreatesSites;
+    use CreatesUsers;
     use DatabaseTruncation;
 
     /**
diff --git a/tests/Feature/GraphQL/TargetTypeTest.php b/tests/Feature/GraphQL/TargetTypeTest.php
index 94c8b13cc2..6a12928cde 100644
--- a/tests/Feature/GraphQL/TargetTypeTest.php
+++ b/tests/Feature/GraphQL/TargetTypeTest.php
@@ -17,8 +17,8 @@
 
 class TargetTypeTest extends TestCase
 {
-    use CreatesUsers;
     use CreatesProjects;
+    use CreatesUsers;
 
     private Project $project;
 
diff --git a/tests/Feature/GraphQL/TestMeasurementTypeTest.php b/tests/Feature/GraphQL/TestMeasurementTypeTest.php
index 5ddcc34b89..7bf1e59907 100644
--- a/tests/Feature/GraphQL/TestMeasurementTypeTest.php
+++ b/tests/Feature/GraphQL/TestMeasurementTypeTest.php
@@ -12,8 +12,8 @@
 
 class TestMeasurementTypeTest extends TestCase
 {
-    use CreatesUsers;
     use CreatesProjects;
+    use CreatesUsers;
 
     private Project $project;
     private TestOutput $test_output;
diff --git a/tests/Feature/GraphQL/TestTypeTest.php b/tests/Feature/GraphQL/TestTypeTest.php
index 3b3080ea2d..39e54b81ab 100644
--- a/tests/Feature/GraphQL/TestTypeTest.php
+++ b/tests/Feature/GraphQL/TestTypeTest.php
@@ -13,8 +13,8 @@
 
 class TestTypeTest extends TestCase
 {
-    use CreatesUsers;
     use CreatesProjects;
+    use CreatesUsers;
 
     private Project $project;
     private TestOutput $test_output;
diff --git a/tests/Feature/LoginAndRegistration.php b/tests/Feature/LoginAndRegistration.php
index d56d2331ce..e3fdbe6005 100644
--- a/tests/Feature/LoginAndRegistration.php
+++ b/tests/Feature/LoginAndRegistration.php
@@ -39,7 +39,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        User::where('email', LoginAndRegistration::$email)->first()?->delete();
+        User::where('email', self::$email)->first()?->delete();
         $this->user?->delete();
 
         parent::tearDown();
@@ -59,9 +59,9 @@ public function testRegisterUser(): void
         $post_data = [
             'fname' => 'Test',
             'lname' => 'User',
-            'email' => LoginAndRegistration::$email,
-            'password' => LoginAndRegistration::$password,
-            'password_confirmation' => LoginAndRegistration::$password,
+            'email' => self::$email,
+            'password' => self::$password,
+            'password_confirmation' => self::$password,
             'institution' => 'home',
             'sent' => 'Register',
             'url' => 'catchbot',
@@ -69,7 +69,7 @@ public function testRegisterUser(): void
         $this->post(route('register'), $post_data);
 
         // Verify that it really landed in the database.
-        $this->assertDatabaseHas('users', ['email' => LoginAndRegistration::$email]);
+        $this->assertDatabaseHas('users', ['email' => self::$email]);
     }
 
     public function testUserCanLoginWithCorrectCredentials(): void
@@ -351,9 +351,9 @@ public function testRegisterUserWhenDisabled(): void
         $post_data = [
             'fname' => 'Test',
             'lname' => 'User',
-            'email' => LoginAndRegistration::$blockedEmail,
-            'password' => LoginAndRegistration::$password,
-            'password_confirmation' => LoginAndRegistration::$password,
+            'email' => self::$blockedEmail,
+            'password' => self::$password,
+            'password_confirmation' => self::$password,
             'institution' => 'home',
             'sent' => 'Register',
             'url' => 'catchbot',
@@ -361,7 +361,7 @@ public function testRegisterUserWhenDisabled(): void
         $this->post(route('register'), $post_data);
 
         // Verify that nothing was added to the database
-        $this->assertDatabaseMissing('users', ['email' => LoginAndRegistration::$blockedEmail]);
+        $this->assertDatabaseMissing('users', ['email' => self::$blockedEmail]);
     }
 
     public function testDisabledRegistrationForm(): void
diff --git a/tests/Feature/ProjectInvitationAcceptanceTest.php b/tests/Feature/ProjectInvitationAcceptanceTest.php
index efa01c6c82..90220ae1b4 100644
--- a/tests/Feature/ProjectInvitationAcceptanceTest.php
+++ b/tests/Feature/ProjectInvitationAcceptanceTest.php
@@ -13,8 +13,8 @@
 
 class ProjectInvitationAcceptanceTest extends TestCase
 {
-    use CreatesUsers;
     use CreatesProjects;
+    use CreatesUsers;
 
     protected Project $project;
 
diff --git a/tests/Feature/ProjectPermissions.php b/tests/Feature/ProjectPermissions.php
index 8db1ac2cb4..f3a9b3971b 100644
--- a/tests/Feature/ProjectPermissions.php
+++ b/tests/Feature/ProjectPermissions.php
@@ -12,8 +12,8 @@
 
 class ProjectPermissions extends TestCase
 {
-    use CreatesUsers;
     use CreatesProjects;
+    use CreatesUsers;
 
     protected Project $public_project;
     protected Project $protected_project;
diff --git a/tests/Feature/PurgeUnusedProjectsCommand.php b/tests/Feature/PurgeUnusedProjectsCommand.php
index edb3e9dfc6..2a3430ed53 100644
--- a/tests/Feature/PurgeUnusedProjectsCommand.php
+++ b/tests/Feature/PurgeUnusedProjectsCommand.php
@@ -11,8 +11,8 @@
 
 class PurgeUnusedProjectsCommand extends TestCase
 {
-    use DatabaseTruncation;
     use CreatesProjects;
+    use DatabaseTruncation;
 
     private \App\Models\Project $project1;
     private \App\Models\Project $project2;
diff --git a/tests/Feature/RouteAccessTest.php b/tests/Feature/RouteAccessTest.php
index 48f215f0c3..3c46a5d098 100644
--- a/tests/Feature/RouteAccessTest.php
+++ b/tests/Feature/RouteAccessTest.php
@@ -14,8 +14,8 @@
 
 class RouteAccessTest extends TestCase
 {
-    use CreatesUsers;
     use CreatesProjects;
+    use CreatesUsers;
 
     private User $normal_user;
     private User $admin_user;
diff --git a/tests/Feature/SubmissionValidation.php b/tests/Feature/SubmissionValidation.php
index 5c109c2eba..3b781a8f16 100644
--- a/tests/Feature/SubmissionValidation.php
+++ b/tests/Feature/SubmissionValidation.php
@@ -10,8 +10,8 @@
 
 class SubmissionValidation extends TestCase
 {
-    use CreatesSubmissions;
     use CreatesProjects;
+    use CreatesSubmissions;
 
     protected string $ConfigFile = '';
     protected mixed $Original = '';