Apply "risky" PHP migration formatter rules (#2668)

This PR continues our ongoing effort to modernize the codebase by
applying stricter code formatting rules. This PR also helps us better
take advantage of new PHP features. Most of the rules applied here are
"risky" in cases which do not apply to CDash.

Author: williamjallen

.php-cs-fixer.dist.php

@@ -1,6 +1,9 @@
 <?php
 
-$finder = PhpCsFixer\Finder::create()
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+
+$finder = Finder::create()
     ->exclude('app/cdash/config')
     ->exclude('bootstrap/cache')
     ->exclude('node_modules')
@@ -9,23 +12,25 @@
     ->exclude('_build')
     ->exclude('resources')
     ->exclude('public')
+    ->exclude('app/cdash/tests/kwtest/simpletest')
     ->notPath('app/cdash/tests/config.test.local.php')
-    ->in(__DIR__)
-;
+    ->in(__DIR__);
 
-$config = new PhpCsFixer\Config();
+$config = new Config();
 return $config->setRules([
-        '@PSR12' => true,
-        '@PHP82Migration' => true,
-        '@Symfony' => true,
-        'yoda_style' => false,
-        'blank_line_before_statement' => false,
-        'phpdoc_summary' => false,
-        'concat_space' => ['spacing' => 'one'],
-        'increment_style' => ['style' => 'post'],
-        'fully_qualified_strict_types' => ['import_symbols' => true],
-        'global_namespace_import' => ['import_classes' => true, 'import_constants' => null, 'import_functions' => null],
-        'phpdoc_align' => ['align' => 'left'],
-    ])
-    ->setFinder($finder)
-;
+    '@PSR12' => true,
+    '@PSR12:risky' => true,
+    '@PHP82Migration' => true,
+    '@PHP82Migration:risky' => true,
+    '@Symfony' => true,
+    'yoda_style' => false,
+    'blank_line_before_statement' => false,
+    'phpdoc_summary' => false,
+    'concat_space' => ['spacing' => 'one'],
+    'increment_style' => ['style' => 'post'],
+    'fully_qualified_strict_types' => ['import_symbols' => true],
+    '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...
+    'void_return' => false, // TODO: turn this back on.  Currently causes errors...
+])->setFinder($finder);

app/Http/Controllers/BuildController.php

@@ -666,9 +666,7 @@ public function viewUpdatePageContent(): JsonResponse
 
         $directoryarray = array_unique($directoryarray);
 
-        usort($directoryarray, function ($a, $b) {
-            return $a > $b ? 1 : 0;
-        });
+        usort($directoryarray, fn ($a, $b) => $a > $b ? 1 : 0);
         usort($updatearray1, function ($a, $b) {
             // Extract directory
             $filenamea = $a['filename'];
@@ -1009,9 +1007,7 @@ public function apiViewBuildError(): JsonResponse
         }
 
         if ($this->build->IsParentBuild()) {
-            $response['numSubprojects'] = count(array_unique(array_map(function ($buildError) {
-                return $buildError['subprojectid'];
-            }, $response['errors'])));
+            $response['numSubprojects'] = count(array_unique(array_map(fn ($buildError) => $buildError['subprojectid'], $response['errors'])));
         }
 
         $pageTimer->end($response);

app/Http/Controllers/BuildPropertiesController.php

@@ -116,9 +116,7 @@ public function apiBuildProperties(): JsonResponse
         }
         $response['defecttypes'] = $defect_types;
 
-        $defect_types = array_filter($defect_types, function ($defect_type) {
-            return $defect_type['selected'];
-        });
+        $defect_types = array_filter($defect_types, fn ($defect_type) => $defect_type['selected']);
 
         // Construct an SQL SELECT clause for the requested types of defects.
         $defect_keys = [];

app/Http/Controllers/CoverageController.php

@@ -1794,9 +1794,7 @@ public function apiCompareCoverage(): JsonResponse
 
         if (!empty($subproject_groups)) {
             // At this point it is safe to remove any empty $coveragegroups from our response.
-            $coveragegroups_response = array_filter($coveragegroups, function ($group) {
-                return $group['label'] === 'Total' || !empty($group['coverages']);
-            });
+            $coveragegroups_response = array_filter($coveragegroups, fn ($group) => $group['label'] === 'Total' || !empty($group['coverages']));
 
             // Report coveragegroups as a list, not an associative array.
             $coveragegroups_response = array_values($coveragegroups_response);

app/Http/Controllers/RemoteProcessingController.php

@@ -111,7 +111,7 @@ public function requeueSubmissionFile(): Response
 
         // Requeue the file with exponential backoff.
         PendingSubmissions::IncrementForBuildId($buildid);
-        $delay = (int) pow(config('cdash.retry_base'), $retry_handler->Retries);
+        $delay = ((int) config('cdash.retry_base')) ** $retry_handler->Retries;
         ProcessSubmission::dispatch($filename, $projectid, $buildid, md5_file(Storage::path("inbox/{$filename}")))->delay(now()->addSeconds($delay));
         return response('OK', Response::HTTP_OK);
     }

app/Jobs/ProcessSubmission.php

@@ -116,7 +116,7 @@ private function requeueSubmissionFile($buildid): bool
 
             // Requeue the file with exponential backoff.
             PendingSubmissions::IncrementForBuildId($this->buildid);
-            $delay = pow(config('cdash.retry_base'), $retry_handler->Retries);
+            $delay = ((int) config('cdash.retry_base')) ** $retry_handler->Retries;
             if (config('queue.default') === 'sqs-fifo') {
                 // Special handling for sqs-fifo, which does not support per-message delays.
                 sleep(10);

app/Utils/RepositoryUtils.php

@@ -709,7 +709,7 @@ public static function linkify_compiler_output($projecturl, $source_dir, $revisi
         }
 
         // Make sure we specify a protocol so this isn't interpreted as a relative path.
-        if (strpos($projecturl, '//') === false) {
+        if (!str_contains($projecturl, '//')) {
             $projecturl = '//' . $projecturl;
         }
         $repo_link = "<a class='cdash-link' href='$projecturl/blob/$revision";
@@ -776,7 +776,7 @@ public static function post_github_pull_request_comment(Project $project, $pull_
         $repo = null;
         $repositories = $project->GetRepositories();
         foreach ($repositories as $repository) {
-            if (strpos($repository['url'], 'github.com') !== false) {
+            if (str_contains($repository['url'], 'github.com')) {
                 $repo = $repository;
                 break;
             }

app/cdash/app/Controller/Api/Index.php

@@ -189,9 +189,7 @@ public function getDailyBuilds(): array
         $sql .= $this->limitSQL;
 
         $builds = DB::select($sql, $query_params);
-        return array_map(function ($item) {
-            return (array) $item;
-        }, $builds);
+        return array_map(fn ($item) => (array) $item, $builds);
     }
 
     public function getDynamicBuilds(): array

app/cdash/app/Controller/Api/QueryTests.php

@@ -86,7 +86,7 @@ private function rowSurvivesTestOutputFilter($row, &$build)
         $match_length = 0;
 
         foreach ($this->testOutputExclude as $exclude) {
-            if (strpos($test_output, $exclude) !== false) {
+            if (str_contains($test_output, $exclude)) {
                 return false;
             }
         }

app/cdash/app/Controller/Api/TestOverview.php

@@ -163,7 +163,7 @@ public function getResponse()
 
             if ($status === 'passed') {
                 $all_tests[$test_name]['passed']++;
-            } elseif (strpos($row['details'], 'Timeout') !== false) {
+            } elseif (str_contains($row['details'], 'Timeout')) {
                 $all_tests[$test_name]['timeout']++;
             } else {
                 $all_tests[$test_name]['failed']++;