Skip to content

[5.3] Use null coalescing assignment operator for modules and plugins #44972

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
rdeutz merged 2 commits into from
Feb 27, 2025
Merged

[5.3] Use null coalescing assignment operator for modules and plugins #44972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9763cfe
Use null coalescing assignment operator for modules and plugins
joomdonation Feb 22, 2025
a5747aa
Merge branch '5.3-dev' into user_null_coalescing_assignment_operator_…
QuyTon Feb 27, 2025
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
4 changes: 2 additions & 2 deletions administrator/modules/mod_menu/src/Menu/CssMenu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,8 @@ protected function preprocess($parent)
continue;
}

$item->scope = $item->scope ?? 'default';
$item->icon = $item->icon ?? '';
$item->scope ??= 'default';
$item->icon ??= '';

// Whether this scope can be displayed. Applies only to preset items. Db driven items should use un/published state.
if (($item->scope === 'help' && $this->params->get('showhelp', 1) == 0) || ($item->scope === 'edit' && !$this->params->get('shownew', 1))) {
Expand Down
8 changes: 4 additions & 4 deletions plugins/editors/tinymce/src/PluginTraits/XTDButtons.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ private function tinyButtons($buttons, array $options = []): array
if ($link && $link[0] !== '#') {
$link = str_contains($link, '&') ? htmlspecialchars_decode($link) : $link;
$link = Uri::base(true) . '/' . $link;
$options['src'] = $options['src'] ?? $link;
$options['src'] ??= $link;
}

// Set action to "modal" for legacy buttons, when possible
Expand All @@ -85,9 +85,9 @@ private function tinyButtons($buttons, array $options = []): array
$wa->useScript('joomla.dialog');
$legacyModal = false;

$options['popupType'] = $options['popupType'] ?? 'iframe';
$options['textHeader'] = $options['textHeader'] ?? $title;
$options['iconHeader'] = $options['iconHeader'] ?? 'icon-' . $icon;
$options['popupType'] ??= 'iframe';
$options['textHeader'] ??= $title;
$options['iconHeader'] ??= 'icon-' . $icon;
}

$coreButton = [];
Expand Down
2 changes: 1 addition & 1 deletion plugins/system/debug/src/DataCollector/ProfileCollector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ public function setRequestEndTime($time): self
*/
public function collect(): array
{
$this->requestEndTime = $this->requestEndTime ?? microtime(true);
$this->requestEndTime ??= microtime(true);

$start = $this->requestStartTime;

Expand Down