Skip to content

[stable28] Add RichObject support for SetupCheck descriptions #42804

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
susnux merged 7 commits into from
Jan 15, 2024
Merged

[stable28] Add RichObject support for SetupCheck descriptions #42804

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
25c91e6
Add RichObject support for SetupChecks descriptions
come-nc Jan 4, 2024
0b58618
Validate rich objects passed to SetupResult
come-nc Jan 9, 2024
c335d36
Fix psalm issue in SetupChecks command
come-nc Jan 9, 2024
18533bb
Fix UI for rich object in setupcheck results
come-nc Jan 9, 2024
ba78b6c
Add TODO for richToParsed refactor
come-nc Jan 9, 2024
5a8004e
Document new throw possibility in SetupResult
come-nc Jan 9, 2024
23bab8a
Use match statement in richToParsed implementation
come-nc Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Use match statement in richToParsed implementation 
Co-authored-by: Benjamin Gaussorgues <[email protected]>
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc @Altahrim @skjnldsv
2 people authored and skjnldsv committed Jan 15, 2024
commit 23bab8a61d3a07117c4e5c2602115ecdf35ae291
12 changes: 5 additions & 7 deletions core/Command/SetupChecks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,11 @@ private function richToParsed(string $message, array $parameters): string {
throw new \InvalidArgumentException("Invalid rich object, {$requiredField} field is missing");
}
}
if ($parameter['type'] === 'user') {
$replacements[] = '@' . $parameter['name'];
} elseif ($parameter['type'] === 'file') {
$replacements[] = $parameter['path'] ?? $parameter['name'];
} else {
$replacements[] = $parameter['name'];
}
$replacements[] = match($parameter['type']) {
'user' => '@' . $parameter['name'],
'file' => $parameter['path'] ?? $parameter['name'],
default => $parameter['name'],
};
}
return str_replace($placeholders, $replacements, $message);
}
Expand Down