Skip to content

[5.2] Change all calls for AbstractView::document getDocument() #43205

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
pe7er merged 2 commits into from
Apr 11, 2024
Merged

[5.2] Change all calls for AbstractView::document getDocument() #43205

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
5e038df
Change all calls for AbstractView::document to AbstractView::getDocum…
Hackwar Apr 3, 2024
c0b8d22
Merge branch '5.2-dev' into 5.2-phpstan-document
pe7er Apr 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
2 changes: 1 addition & 1 deletion administrator/components/com_actionlogs/tmpl/actionlogs/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
$listDirn = $this->escape($this->state->get('list.direction'));

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('keepalive')
->useScript('table.columns')
->useScript('multiselect')
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/tmpl/help/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/** @var \Joomla\Component\Admin\Administrator\View\Help\HtmlView $this */

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('com_admin.admin-help');

?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_associations/tmpl/association/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/** @var HtmlView $this */

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('keepalive')
->useScript('form.validate')
->usePreset('com_associations.sidebyside')
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_associations/tmpl/associations/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
/** @var Joomla\Component\Associations\Administrator\View\Associations\HtmlView $this */

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('com_associations.admin-associations-default')
->useScript('table.columns')
->useScript('multiselect');
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_associations/tmpl/associations/modal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
}

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('multiselect')
->useScript('com_associations.admin-associations-modal');

Expand All @@ -43,7 +43,7 @@
2 => 'icon-folder',
];

$this->document->addScriptOptions('associations-modal', ['func' => $function]);
$this->getDocument()->addScriptOptions('associations-modal', ['func' => $function]);

?>
<div class="container-popup">
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_banners/tmpl/banner/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/** @var \Joomla\Component\Banners\Administrator\View\Banner\HtmlView $this */

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('keepalive')
->useScript('form.validate')
->useScript('com_banners.admin-banner-edit');
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_banners/tmpl/banners/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
/** @var \Joomla\Component\Banners\Administrator\View\Banners\HtmlView $this */

/** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('table.columns')
->useScript('multiselect');

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_banners/tmpl/client/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/** @var \Joomla\Component\Banners\Administrator\View\Client\HtmlView $this */

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('keepalive')
->useScript('form.validate');

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_banners/tmpl/download/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/** @var \Joomla\Component\Banners\Administrator\View\Download\HtmlView $this */

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('form.validate');

?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_banners/tmpl/tracks/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/** @var \Joomla\Component\Banners\Administrator\View\Tracks\HtmlView $this */

/** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('table.columns');

/** @var \Joomla\Component\Banners\Administrator\View\Tracks\HtmlView $this */
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_cache/tmpl/cache/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
$listDirn = $this->escape($this->state->get('list.direction'));

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('keepalive')
->useScript('table.columns')
->useScript('multiselect')
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_categories/tmpl/categories/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/** @var \Joomla\Component\Categories\Administrator\View\Categories\HtmlView $this */

/** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('table.columns')
->useScript('multiselect');

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_categories/tmpl/categories/modal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
}

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('core')
->useScript('modal-content-select');

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_categories/tmpl/category/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/** @var \Joomla\Component\Categories\Administrator\View\Category\HtmlView $this */

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('keepalive')
->useScript('form.validate');

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_categories/tmpl/category/modal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

?>
<div class="subhead noshadow mb-3">
<?php echo $this->document->getToolbar('toolbar')->render(); ?>
<?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
</div>
<div class="container-popup">
<?php $this->setLayout('edit'); ?>
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_categories/tmpl/category/modalreturn.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@

// Add Content select script
/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('modal-content-select');

// The data for Content select script
$this->document->addScriptOptions('content-select-on-load', $data, false);
$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);

?>

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_checkin/tmpl/checkin/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/** @var \Joomla\Component\Checkin\Administrator\View\Checkin\HtmlView $this */

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('multiselect');

$listOrder = $this->escape($this->state->get('list.ordering'));
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_config/tmpl/application/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
/** @var \Joomla\Component\Config\Administrator\View\Application\HtmlView $this */

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('keepalive')
->useScript('form.validate');

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_config/tmpl/application/default_mail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/** @var \Joomla\Component\Config\Administrator\View\Application\HtmlView $this */

HTMLHelper::_('form.csrf');
$this->document->getWebAssetManager()
$this->getDocument()->getWebAssetManager()
->useScript('webcomponent.field-send-test-mail');

// Load JavaScript message titles
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_config/tmpl/component/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
Text::script('MESSAGE');

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('form.validate')
->useScript('keepalive');

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_contact/tmpl/contact/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
/** @var \Joomla\Component\Contact\Administrator\View\Contact\HtmlView $this */

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('keepalive')
->useScript('form.validate');

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_contact/tmpl/contact/modal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
/** @var \Joomla\Component\Contact\Administrator\View\Contact\HtmlView $this */
?>
<div class="subhead noshadow mb-3">
<?php echo $this->document->getToolbar('toolbar')->render(); ?>
<?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
</div>
<div class="container-popup">
<?php $this->setLayout('edit'); ?>
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_contact/tmpl/contact/modalreturn.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@

// Add Content select script
/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('modal-content-select');

// The data for Content select script
$this->document->addScriptOptions('content-select-on-load', $data, false);
$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);

?>

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_contact/tmpl/contacts/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/** @var \Joomla\Component\Contact\Administrator\View\Contacts\HtmlView $this */

/** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('table.columns')
->useScript('multiselect');

Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_contact/tmpl/contacts/modal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
}

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('modal-content-select')
->useScript('com_contact.admin-contacts-modal');

Expand All @@ -42,7 +42,7 @@

if (!empty($editor)) {
// This view is used also in com_menus. Load the xtd script only if the editor is set!
$this->document->addScriptOptions('xtd-contacts', ['editor' => $editor]);
$this->getDocument()->addScriptOptions('xtd-contacts', ['editor' => $editor]);
$onclick = "jSelectContact";
}
?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_content/tmpl/article/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
use Joomla\Registry\Registry;

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->getRegistry()->addExtensionRegistryFile('com_contenthistory');
$wa->useScript('keepalive')
->useScript('form.validate')
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_content/tmpl/article/modal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
/** @var \Joomla\Component\Content\Administrator\View\Article\HtmlView $this */
?>
<div class="subhead noshadow mb-3">
<?php echo $this->document->getToolbar('toolbar')->render(); ?>
<?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
</div>
<div class="container-popup">
<?php $this->setLayout('edit'); ?>
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_content/tmpl/article/modalreturn.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@

// Add Content select script
/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('modal-content-select');

// The data for Content select script
$this->document->addScriptOptions('content-select-on-load', $data, false);
$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);

?>

Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_content/tmpl/article/pagebreak.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
/** @var \Joomla\Component\Content\Administrator\View\Article\HtmlView $this */

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('com_content.admin-article-pagebreak');

$this->eName = Factory::getApplication()->getInput()->getCmd('e_name', '');
$this->eName = preg_replace('#[^A-Z0-9\-\_\[\]]#i', '', $this->eName);
$this->document->setTitle(Text::_('COM_CONTENT_PAGEBREAK_DOC_TITLE'));
$this->getDocument()->setTitle(Text::_('COM_CONTENT_PAGEBREAK_DOC_TITLE'));

?>
<div class="container-popup">
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_content/tmpl/articles/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/** @var \Joomla\Component\Content\Administrator\View\Articles\HtmlView $this */

/** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('table.columns')
->useScript('multiselect');

Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_content/tmpl/articles/modal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
}

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('core')
->useScript('multiselect')
->useScript('modal-content-select')
Expand All @@ -44,7 +44,7 @@

if (!empty($editor)) {
// This view is used also in com_menus. Load the xtd script only if the editor is set!
$this->document->addScriptOptions('xtd-articles', ['editor' => $editor]);
$this->getDocument()->addScriptOptions('xtd-articles', ['editor' => $editor]);
$onclick = "jSelectArticle";
}
?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_content/tmpl/featured/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/** @var \Joomla\Component\Content\Administrator\View\Featured\HtmlView $this */

/** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('table.columns')
->useScript('multiselect');

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_content/tmpl/featured/default_stage_footer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
/** @var \Joomla\Component\Content\Administrator\View\Featured\HtmlView $this */

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('com_content.admin-articles-stage');

?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_contenthistory/tmpl/compare/compare.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
$object2 = $version2->data;

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('com_contenthistory.admin-compare-compare');

?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_contenthistory/tmpl/history/modal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
JS;

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('multiselect')
->useScript('com_contenthistory.admin-history-modal')
->useScript('list-view')
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_cpanel/tmpl/cpanel/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
Text::script('COM_CPANEL_UNPUBLISH_MODULE_ERROR');

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('com_cpanel.admin-cpanel')
->useScript('joomla.dialog-autocreate');

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_fields/tmpl/field/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
$this->useCoreUI = true;

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('keepalive')
->useScript('form.validate')
->useScript('com_fields.admin-field-edit');
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_fields/tmpl/fields/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/** @var \Joomla\Component\Fields\Administrator\View\Fields\HtmlView $this */

/** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('table.columns')
->useScript('multiselect');

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_fields/tmpl/fields/default_batch_body.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/** @var \Joomla\Component\Fields\Administrator\View\Fields\HtmlView $this */

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('com_fields.admin-fields-batch');
$wa->useScript('joomla.batch-copymove');

Expand Down
Loading