Skip to content

Commit f1906ba

Browse files
authored
[5.4] Replace deprecation AbstractView::get() in layouts (joomla#45702)
Remove deprecation AbstractView::get() in layouts
1 parent c6a929e commit f1906ba

File tree

12 files changed

+30
-30
lines changed

12 files changed

+30
-30
lines changed

administrator/components/com_menus/layouts/joomla/menu/edit_modules.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
$saveHistory = ComponentHelper::getParams($component)->get('save_history', 0);
2828

29-
$fields = $displayData->get('fields') ?: [
29+
$fields = $displayData->fields ?? [
3030
['parent', 'parent_id'],
3131
['published', 'state', 'enabled'],
3232
['category', 'catid'],
@@ -39,7 +39,7 @@
3939
'version_note',
4040
];
4141

42-
$hiddenFields = $displayData->get('hidden_fields') ?: [];
42+
$hiddenFields = $displayData->hidden_fields ?? [];
4343

4444
if (!$saveHistory) {
4545
$hiddenFields[] = 'version_note';

components/com_contact/src/View/Categories/HtmlView.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ class HtmlView extends CategoriesView
3535
* @var string The name of the extension for the category
3636
* @since 3.2
3737
*/
38-
protected $extension = 'com_contact';
38+
public $extension = 'com_contact';
3939
}

components/com_content/src/View/Categories/HtmlView.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ class HtmlView extends CategoriesView
3535
* @var string The name of the extension for the category
3636
* @since 3.2
3737
*/
38-
protected $extension = 'com_content';
38+
public $extension = 'com_content';
3939
}

components/com_newsfeeds/src/View/Categories/HtmlView.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ class HtmlView extends CategoriesView
3535
* @var string The name of the extension for the category
3636
* @since 3.2
3737
*/
38-
protected $extension = 'com_newsfeeds';
38+
public $extension = 'com_newsfeeds';
3939
}

layouts/joomla/content/categories_default.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<?php // If there is a description in the menu parameters use that; ?>
2424
<?php if ($displayData->params->get('categories_description')) : ?>
2525
<div class="category-desc base-desc">
26-
<?php echo HTMLHelper::_('content.prepare', $displayData->params->get('categories_description'), '', $displayData->get('extension') . '.categories'); ?>
26+
<?php echo HTMLHelper::_('content.prepare', $displayData->params->get('categories_description'), '', $displayData->extension . '.categories'); ?>
2727
</div>
2828
<?php else : ?>
2929
<?php // Otherwise get one from the database if it exists. ?>

layouts/joomla/content/category_default.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* layout you need to close this div either by overriding this file or in your main layout.
2121
*/
2222
$params = $displayData->params;
23-
$category = $displayData->get('category');
23+
$category = $displayData->category;
2424
$extension = $category->extension;
2525
$canEdit = $params->get('access-edit');
2626
$className = substr($extension, 4);
@@ -89,7 +89,7 @@
8989
<?php endif; ?>
9090
<?php echo $displayData->loadTemplate($displayData->subtemplatename); ?>
9191

92-
<?php if ($displayData->maxLevel != 0 && $displayData->get('children')) : ?>
92+
<?php if ($displayData->maxLevel != 0 && $displayData->children) : ?>
9393
<div class="cat-children">
9494
<?php if ($params->get('show_category_heading_title_text', 1) == 1) : ?>
9595
<h3>

layouts/joomla/edit/admin_modules.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
$form = $displayData->getForm();
1818
$input = $app->getInput();
1919

20-
$fields = $displayData->get('fields') ?: [
20+
$fields = $displayData->fields ?? [
2121
['parent', 'parent_id'],
2222
['published', 'state', 'enabled'],
2323
['category', 'catid'],
@@ -30,7 +30,7 @@
3030
'version_note',
3131
];
3232

33-
$hiddenFields = $displayData->get('hidden_fields') ?: [];
33+
$hiddenFields = $displayData->hidden_fields ?? [];
3434

3535
if (!ModuleHelper::isAdminMultilang()) {
3636
$hiddenFields[] = 'language';

layouts/joomla/edit/fieldset.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
$app = Factory::getApplication();
1616
$form = $displayData->getForm();
1717

18-
$name = $displayData->get('fieldset');
18+
$name = $displayData->fieldset;
1919
$fieldSet = $form->getFieldset($name);
2020

2121
if (empty($fieldSet)) {
2222
return;
2323
}
2424

25-
$ignoreFields = $displayData->get('ignore_fields') ? : [];
26-
$extraFields = $displayData->get('extra_fields') ? : [];
25+
$ignoreFields = $displayData->ignore_fields ?? [];
26+
$extraFields = $displayData->extra_fields ?? [];
2727

28-
if (!empty($displayData->showOptions) || $displayData->get('show_options', 1)) {
28+
if (!empty($displayData->showOptions) || ($displayData->show_options ?? 1)) {
2929
if (isset($extraFields[$name])) {
3030
foreach ($extraFields[$name] as $f) {
3131
if (in_array($f, $ignoreFields)) {

layouts/joomla/edit/global.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
$saveHistory = ComponentHelper::getParams($component)->get('save_history', 0);
3030

31-
$fields = $displayData->get('fields') ?: [
31+
$fields = $displayData->fields ?? [
3232
'transition',
3333
['parent', 'parent_id'],
3434
['published', 'state', 'enabled'],
@@ -42,7 +42,7 @@
4242
'version_note',
4343
];
4444

45-
$hiddenFields = $displayData->get('hidden_fields') ?: [];
45+
$hiddenFields = $displayData->hidden_fields ?? [];
4646

4747
if (!$saveHistory) {
4848
$hiddenFields[] = 'version_note';

layouts/joomla/edit/params.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@
1818
$app = Factory::getApplication();
1919
$form = $displayData->getForm();
2020
$fieldSets = $form->getFieldsets();
21-
$helper = $displayData->get('useCoreUI', false) ? 'uitab' : 'bootstrap';
21+
$helper = ($displayData->useCoreUI ?? false) ? 'uitab' : 'bootstrap';
2222

2323
if (empty($fieldSets)) {
2424
return;
2525
}
2626

27-
$ignoreFieldsets = $displayData->get('ignore_fieldsets') ?: [];
28-
$outputFieldsets = $displayData->get('output_fieldsets') ?: [];
29-
$ignoreFieldsetFields = $displayData->get('ignore_fieldset_fields') ?: [];
30-
$ignoreFields = $displayData->get('ignore_fields') ?: [];
31-
$extraFields = $displayData->get('extra_fields') ?: [];
32-
$tabName = $displayData->get('tab_name') ?: 'myTab';
27+
$ignoreFieldsets = $displayData->ignore_fieldsets ?? [];
28+
$outputFieldsets = $displayData->output_fieldsets ?? [];
29+
$ignoreFieldsetFields = $displayData->ignore_fieldset_fields ?? [];
30+
$ignoreFields = $displayData->ignore_fields ?? [];
31+
$extraFields = $displayData->extra_fields ?? [];
32+
$tabName = $displayData->tab_name ?? 'myTab';
3333

3434
// These are required to preserve data on save when fields are not displayed.
35-
$hiddenFieldsets = $displayData->get('hiddenFieldsets') ?: [];
35+
$hiddenFieldsets = $displayData->hiddenFieldsets ?? [];
3636

3737
// These are required to configure showing and hiding fields in the editor.
38-
$configFieldsets = $displayData->get('configFieldsets') ?: [];
38+
$configFieldsets = $displayData->configFieldsets ?? [];
3939

4040
// Handle the hidden fieldsets when show_options is set false
41-
if (!$displayData->get('show_options', 1)) {
41+
if (!($displayData->show_options ?? 1)) {
4242
// The HTML buffer
4343
$html = [];
4444

0 commit comments

Comments
 (0)