Fix check for any site for wildcard group

Kitware · May 3, 2024 · 1d4c185 · 1d4c185
1 parent d883b90
commit 1d4c185
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/app/cdash/public/api/v1/manageBuildGroup.php b/app/cdash/public/api/v1/manageBuildGroup.php
@@ -171,7 +171,7 @@
             $rule_response['match'] = $match;
 
             $siteid = $rule->SiteId;
-            if (empty($siteid)) {
+            if ((int) $siteid === 0) {
                 $rule_response['sitename'] = 'Any';
                 $rule_response['siteid'] = 0;
             } else {
@@ -185,7 +185,7 @@
                     }
                 }
                 if (!$found) {
-                    $site = Site::find($siteid);
+                    $site = Site::findOrFail((int) $siteid);
                     $rule_response['sitename'] = $site->name;
                 }
             }

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -15762,11 +15762,6 @@ parameters:
 			count: 1
 			path: app/cdash/public/api/v1/manageBuildGroup.php
 
-		-
-			message: "#^Cannot access property \\$name on App\\\\Models\\\\Site\\|Illuminate\\\\Database\\\\Eloquent\\\\Collection\\<int, App\\\\Models\\\\Site\\>\\|null\\.$#"
-			count: 1
-			path: app/cdash/public/api/v1/manageBuildGroup.php
-
 		-
 			message: "#^Cannot call method bindParam\\(\\) on PDOStatement\\|false\\.$#"
 			count: 3
@@ -15779,7 +15774,7 @@ parameters:
 
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 6
+			count: 5
 			path: app/cdash/public/api/v1/manageBuildGroup.php
 
 		-