Skip to content

[4.0] PHP 8.1 deprecation notices administrator/components #36360

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
merged 6 commits into from
Dec 28, 2021
Merged

[4.0] PHP 8.1 deprecation notices administrator/components #36360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5c739fc
administrator/components
frostmakk Dec 20, 2021
9137ca6
2 more
frostmakk Dec 20, 2021
c7ebf57
Update
frostmakk Dec 22, 2021
ca96efb
Moved comment
frostmakk Dec 23, 2021
4411509
Requested change
frostmakk Dec 23, 2021
170dc29
Merge branch 'joomla:4.0-dev' into admin-com
frostmakk Dec 23, 2021
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_banners/src/Model/ClientsModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ protected function getListQuery()
);

// Filter by search in title
if ($search = trim($this->getState('filter.search')))
if ($search = trim($this->getState('filter.search', '')))
{
if (stripos($search, 'id:') === 0)
{
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_config/src/Controller/DisplayController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class DisplayController extends BaseController
*/
public function display($cachable = false, $urlparams = array())
{
$component = $this->input->get('component');
$component = $this->input->get('component', '');

// Make sure com_joomlaupdate and com_privacy can only be accessed by SuperUser
if (in_array(strtolower($component), array('com_joomlaupdate', 'com_privacy'))
Expand Down
6 changes: 3 additions & 3 deletions administrator/components/com_fields/src/Plugin/FieldsPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,10 @@ public function onCustomFieldsPrepareDom($field, \DOMElement $parent, Form $form
$node->setAttribute('name', $field->name);
$node->setAttribute('type', $field->type);
$node->setAttribute('label', $field->label);
$node->setAttribute('labelclass', $field->params->get('label_class'));
$node->setAttribute('labelclass', $field->params->get('label_class', ''));
$node->setAttribute('description', $field->description);
$node->setAttribute('class', $field->params->get('class'));
$node->setAttribute('hint', $field->params->get('hint'));
$node->setAttribute('class', $field->params->get('class', ''));
$node->setAttribute('hint', $field->params->get('hint', ''));
$node->setAttribute('required', $field->required ? 'true' : 'false');

if ($field->default_value !== '')
Expand Down
5 changes: 5 additions & 0 deletions administrator/components/com_finder/src/Indexer/Query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,11 @@ protected function processDates($date1, $date2, $when1, $when2)
*/
protected function processString($input, $lang, $mode)
{
if ($input === null)
{
$input = '';
}

// Clean up the input string.
$input = html_entity_decode($input, ENT_QUOTES, 'UTF-8');
$input = StringHelper::strtolower($input);
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_mails/src/Model/TemplateModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public function getForm($data = array(), $loadData = true)
$form->removeField('copyto', 'params');
}

if (!trim($params->get('attachment_folder')))
if (!trim($params->get('attachment_folder', '')))
{
$form->removeField('attachments');

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_menus/tmpl/items/default_batch_body.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
];
$published = (int) $this->state->get('filter.published');
$clientId = (int) $this->state->get('filter.client_id');
$menuType = Factory::getApplication()->getUserState('com_menus.items.menutype');
$menuType = Factory::getApplication()->getUserState('com_menus.items.menutype', '');

if ($clientId == 1)
{
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_menus/tmpl/items/default_batch_footer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

$published = $this->state->get('filter.published');
$clientId = $this->state->get('filter.client_id');
$menuType = Factory::getApplication()->getUserState('com_menus.items.menutype');
$menuType = Factory::getApplication()->getUserState('com_menus.items.menutype', '');
?>
<button type="button" class="btn btn-secondary" onclick="document.getElementById('batch-menu-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value=''" data-bs-dismiss="modal">
<?php echo Text::_('JCANCEL'); ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_templates/src/View/Template/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public function display($tpl = null)
{
$app = Factory::getApplication();
$this->file = $app->input->get('file');
$this->fileName = InputFilter::getInstance()->clean(base64_decode($this->file), 'string');
$this->fileName = InputFilter::getInstance()->clean(base64_decode($this->file ?? ''), 'string');
$explodeArray = explode('.', $this->fileName);
$ext = end($explodeArray);
$this->files = $this->get('Files');
Expand Down