[5.4] Upmerge changes from 5.3-dev 2025-02-28

.php-cs-fixer.dist.php

@@ -91,6 +91,12 @@
             'native_function_invocation'                       => ['include' => ['@compiler_optimized']],
             // Adds null to type declarations when parameter have a default null value
             'nullable_type_declaration_for_default_null_value' => true,
+            // Removes unneeded parentheses around control statements
+            'no_unneeded_control_parentheses'                  => true,
+            // Using isset($var) && multiple times should be done in one call.
+            'combine_consecutive_issets'                       => true,
+            // Calling unset on multiple items should be done in one call
+            'combine_consecutive_unsets'                       => true,
         ]
     )
     ->setFinder($finder);

administrator/components/com_associations/src/Helper/AssociationsHelper.php

@@ -193,7 +193,7 @@ private static function getExtensionHelperClassName($extensionName)
      */
     private static function getExtensionRealName($extensionName)
     {
-        return !str_contains($extensionName, 'com_') ? $extensionName : substr($extensionName, 4);
+        return !str_starts_with($extensionName, 'com_') ? $extensionName : substr($extensionName, 4);
     }
 
     /**
@@ -593,7 +593,7 @@ public static function canCheckinItem($extensionName, $typeName, $itemId)
 
         $userId = Factory::getUser()->id;
 
-        return ($item->{$checkedOutFieldName} == $userId || $item->{$checkedOutFieldName} == 0);
+        return $item->{$checkedOutFieldName} == $userId || $item->{$checkedOutFieldName} == 0;
     }
 
     /**

administrator/components/com_associations/src/View/Associations/HtmlView.php

@@ -174,8 +174,7 @@ public function display($tpl = null)
 
                 // Dynamic filter form.
                 // This selectors doesn't have to activate the filter bar.
-                unset($this->activeFilters['itemtype']);
-                unset($this->activeFilters['language']);
+                unset($this->activeFilters['itemtype'], $this->activeFilters['language']);
 
                 // Remove filters options depending on selected type.
                 if (empty($support['state'])) {
@@ -249,7 +248,7 @@ protected function addToolbar()
     {
         $user = $this->getCurrentUser();
 
-        if (isset($this->typeName) && isset($this->extensionName)) {
+        if (isset($this->typeName, $this->extensionName)) {
             $helper = AssociationsHelper::getExtensionHelper($this->extensionName);
             $title  = $helper->getTypeTitle($this->typeName);
 

administrator/components/com_banners/src/Table/BannerTable.php

@@ -57,6 +57,7 @@ public function __construct(DatabaseDriver $db, ?DispatcherInterface $dispatcher
 
         $this->created = Factory::getDate()->toSql();
         $this->setColumnAlias('published', 'state');
+        $this->setColumnAlias('title', 'name');
     }
 
     /**

administrator/components/com_categories/src/Controller/CategoryController.php

@@ -76,7 +76,7 @@ protected function allowAdd($data = [])
     {
         $user = $this->app->getIdentity();
 
-        return ($user->authorise('core.create', $this->extension) || \count($user->getAuthorisedCategories($this->extension, 'core.create')));
+        return $user->authorise('core.create', $this->extension) || \count($user->getAuthorisedCategories($this->extension, 'core.create'));
     }
 
     /**

administrator/components/com_checkin/src/Model/CheckinModel.php

@@ -102,7 +102,7 @@ public function checkin($ids = [])
 
             $fields = $db->getTableColumns($tn, false);
 
-            if (!(isset($fields['checked_out']) && isset($fields['checked_out_time']))) {
+            if (!(isset($fields['checked_out'], $fields['checked_out_time']))) {
                 continue;
             }
 
@@ -183,7 +183,7 @@ public function getItems()
 
                 $fields = $db->getTableColumns($tn, false);
 
-                if (!(isset($fields['checked_out']) && isset($fields['checked_out_time']))) {
+                if (!(isset($fields['checked_out'], $fields['checked_out_time']))) {
                     continue;
                 }
 

administrator/components/com_config/src/Controller/ComponentController.php

@@ -86,7 +86,7 @@ public function save($key = null, $urlVar = null)
         }
 
         // Remove the permissions rules data if user isn't allowed to edit them.
-        if (!$user->authorise('core.admin', $option) && isset($data['params']) && isset($data['params']['rules'])) {
+        if (!$user->authorise('core.admin', $option) && isset($data['params']['rules'])) {
             unset($data['params']['rules']);
         }
 

administrator/components/com_config/src/Model/ComponentModel.php

@@ -201,8 +201,7 @@ public function save($data)
             }
 
             // We don't need this anymore
-            unset($data['option']);
-            unset($data['params']['rules']);
+            unset($data['option'], $data['params']['rules']);
         }
 
         // Load the previous Data

administrator/components/com_contact/src/Extension/ContactComponent.php

@@ -142,7 +142,7 @@ public function getContexts(): array
      */
     protected function getTableNameForSection(?string $section = null)
     {
-        return ($section === 'category' ? 'categories' : 'contact_details');
+        return $section === 'category' ? 'categories' : 'contact_details';
     }
 
     /**

administrator/components/com_content/src/Model/ArticleModel.php

@@ -649,7 +649,7 @@ public function save($data)
         $input  = $app->getInput();
         $filter = InputFilter::getInstance();
 
-        if (isset($data['metadata']) && isset($data['metadata']['author'])) {
+        if (isset($data['metadata']['author'])) {
             $data['metadata']['author'] = $filter->clean($data['metadata']['author'], 'TRIM');
         }
 

administrator/components/com_contenthistory/src/Helper/ContenthistoryHelper.php

@@ -189,7 +189,7 @@ public static function getLookupValue($lookup, $value)
     {
         $result = false;
 
-        if (isset($lookup->sourceColumn) && isset($lookup->targetTable) && isset($lookup->targetColumn) && isset($lookup->displayColumn)) {
+        if (isset($lookup->sourceColumn, $lookup->targetTable, $lookup->targetColumn, $lookup->displayColumn)) {
             $db    = Factory::getDbo();
             $value = (int) $value;
             $query = $db->getQuery(true);

administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php

@@ -69,7 +69,7 @@ public function display($tpl = null)
             $parts     = explode('.', $dashboard);
             $component = $parts[0];
 
-            if (!str_contains($component, 'com_')) {
+            if (!str_starts_with($component, 'com_')) {
                 $component = 'com_' . $component;
             }
 

administrator/components/com_fields/src/Model/FieldModel.php

@@ -229,7 +229,7 @@ public function save($data)
          */
         if (
             $field && \in_array($field->type, ['list', 'checkboxes', 'radio'], true)
-            && isset($data['fieldparams']['options']) && isset($field->fieldparams['options'])
+            && isset($data['fieldparams']['options'], $field->fieldparams['options'])
         ) {
             $oldParams = $this->getParams($field->fieldparams['options']);
             $newParams = $this->getParams($data['fieldparams']['options']);
@@ -1168,6 +1168,16 @@ protected function batchCopy($value, $pks, $contexts)
 
         foreach ($pks as $pk) {
             if ($user->authorise('core.create', $component . '.fieldgroup.' . $value)) {
+                // Find all assigned categories to this field
+                $db    = $this->getDatabase();
+                $query = $db->getQuery(true);
+
+                $query->select($db->quoteName('category_id'))
+                    ->from($db->quoteName('#__fields_categories'))
+                    ->where($db->quoteName('field_id') . ' = ' . (int) $pk);
+
+                $assignedCatIds = $db->setQuery($query)->loadColumn();
+
                 $table->reset();
                 $table->load($pk);
 
@@ -1194,6 +1204,17 @@ protected function batchCopy($value, $pks, $contexts)
                 // Get the new item ID
                 $newId = $table->id;
 
+                // Inset the assigned categories
+                if (!empty($assignedCatIds)) {
+                    $tuple           = new \stdClass();
+                    $tuple->field_id = $newId;
+
+                    foreach ($assignedCatIds as $catId) {
+                        $tuple->category_id = $catId;
+                        $db->insertObject('#__fields_categories', $tuple);
+                    }
+                }
+
                 // Add the new ID to the array
                 $newIds[$pk] = $newId;
             } else {

administrator/components/com_fields/src/Model/GroupModel.php

@@ -120,14 +120,13 @@ public function getForm($data = [], $loadData = true)
             return false;
         }
 
-        // Modify the form based on Edit State access controls.
-        if (empty($data['context'])) {
-            $data['context'] = $context;
-        }
+        $record          = new \stdClass();
+        $record->context = $context;
+        $record->id      = $jinput->get('id');
 
         $user = $this->getCurrentUser();
 
-        if (!$user->authorise('core.edit.state', $context . '.fieldgroup.' . $jinput->get('id'))) {
+        if (!$this->canEditState($record)) {
             // Disable fields for display.
             $form->setFieldAttribute('ordering', 'disabled', 'true');
             $form->setFieldAttribute('state', 'disabled', 'true');
@@ -160,7 +159,9 @@ protected function canDelete($record)
             return false;
         }
 
-        return $this->getCurrentUser()->authorise('core.delete', $record->context . '.fieldgroup.' . (int) $record->id);
+        $component = explode('.', $record->context)[0];
+
+        return $this->getCurrentUser()->authorise('core.delete', $component . '.fieldgroup.' . (int) $record->id);
     }
 
     /**
@@ -177,13 +178,15 @@ protected function canEditState($record)
     {
         $user = $this->getCurrentUser();
 
+        $component = explode('.', $record->context)[0];
+
         // Check for existing fieldgroup.
         if (!empty($record->id)) {
-            return $user->authorise('core.edit.state', $record->context . '.fieldgroup.' . (int) $record->id);
+            return $user->authorise('core.edit.state', $component . '.fieldgroup.' . (int) $record->id);
         }
 
         // Default to component settings.
-        return $user->authorise('core.edit.state', $record->context);
+        return $user->authorise('core.edit.state', $component);
     }
 
     /**

administrator/components/com_installer/src/Controller/ManageController.php

@@ -173,7 +173,7 @@ public function loadChangelog()
 
         $output = $model->loadChangelog($eid, $source);
 
-        echo (new JsonResponse($output));
+        echo new JsonResponse($output);
     }
 
     /**

administrator/components/com_joomlaupdate/extract.php

@@ -1956,7 +1956,7 @@ function setHugeMemoryLimit()
             @unlink($basePath . 'update.php');
 
             // Import a custom finalisation file
-            $filename = \dirname(__FILE__) . '/finalisation.php';
+            $filename = __DIR__ . '/finalisation.php';
 
             if (file_exists($filename)) {
                 clearFileInOPCache($filename);

administrator/components/com_joomlaupdate/src/Model/UpdateModel.php

@@ -1415,9 +1415,7 @@ public function getNonCoreExtensions()
             $decode = json_decode($extension->manifest_cache);
 
             // Remove unused fields so they do not cause javascript errors during pre-update check
-            unset($decode->description);
-            unset($decode->copyright);
-            unset($decode->creationDate);
+            unset($decode->description, $decode->copyright, $decode->creationDate);
 
             $this->translateExtensionName($extension);
             $extension->version
@@ -1476,9 +1474,7 @@ public function getNonCorePlugins($folderFilter = ['system', 'user', 'authentica
             $decode = json_decode($plugin->manifest_cache);
 
             // Remove unused fields so they do not cause javascript errors during pre-update check
-            unset($decode->description);
-            unset($decode->copyright);
-            unset($decode->creationDate);
+            unset($decode->description, $decode->copyright, $decode->creationDate);
 
             $this->translateExtensionName($plugin);
             $plugin->version = $decode->version ?? Text::_('COM_JOOMLAUPDATE_PREUPDATE_UNKNOWN_EXTENSION_MANIFESTCACHE_VERSION');

administrator/components/com_mails/src/Helper/MailsHelper.php

@@ -75,16 +75,16 @@ public static function loadTranslationFiles($extension, $language = 'en-GB')
             return;
         }
 
-        $lang   = Factory::getLanguage();
+        $lang   = Factory::getApplication()->getLanguage();
         $source = '';
 
         switch (substr($extension, 0, 3)) {
             case 'com':
             default:
                 $source = JPATH_ADMINISTRATOR . '/components/' . $extension;
 
-                $lang->load($extension, JPATH_BASE, $language, true)
-                || $lang->load($extension, JPATH_BASE . '/components/' . $extension, $language, true);
+                $lang->load($extension, JPATH_SITE, $language, true)
+                || $lang->load($extension, JPATH_SITE . '/components/' . $extension, $language, true);
 
                 break;
 

administrator/components/com_menus/src/Model/ItemModel.php

@@ -567,7 +567,7 @@ protected function loadFormData()
 
         // Only merge if there is a session and itemId or itemid is null.
         if (
-            isset($sessionData['id']) && isset($itemData['id']) && $sessionData['id'] === $itemData['id']
+            isset($sessionData['id'], $itemData['id']) && $sessionData['id'] === $itemData['id']
             || \is_null($itemData['id'])
         ) {
             $data = array_merge($itemData, $sessionData);

administrator/components/com_menus/src/Model/MenutypesModel.php

@@ -537,8 +537,7 @@ protected function getTypeOptionsFromLayouts($component, $view)
 
                             // If the view is hidden from the menu, discard it and move on to the next view.
                             if (!empty($menu['hidden']) && $menu['hidden'] == 'true') {
-                                unset($xml);
-                                unset($o);
+                                unset($xml, $o);
                                 continue;
                             }
 

administrator/components/com_modules/src/View/Modules/HtmlView.php

@@ -156,8 +156,7 @@ public function display($tpl = null)
 
             // If in the frontend state and language should not activate the search tools.
             if (Factory::getApplication()->isClient('site')) {
-                unset($this->activeFilters['state']);
-                unset($this->activeFilters['language']);
+                unset($this->activeFilters['state'], $this->activeFilters['language']);
             }
         }
 

administrator/components/com_postinstall/src/Helper/PostinstallHelper.php

@@ -32,9 +32,9 @@ class PostinstallHelper
      */
     public function parsePath($path)
     {
-        if (str_contains($path, 'site://')) {
+        if (str_starts_with($path, 'site://')) {
             $path = JPATH_ROOT . str_replace('site://', '/', $path);
-        } elseif (str_contains($path, 'admin://')) {
+        } elseif (str_starts_with($path, 'admin://')) {
             $path = JPATH_ADMINISTRATOR . str_replace('admin://', '/', $path);
         }
 

administrator/components/com_templates/src/Model/TemplateModel.php

@@ -701,7 +701,7 @@ public function checkNewName()
             ->bind(':name', $name);
         $db->setQuery($query);
 
-        return ($db->loadResult() == 0);
+        return $db->loadResult() == 0;
     }
 
     /**
@@ -2002,15 +2002,17 @@ public function child()
         }
 
         $user = $this->getCurrentUser();
-        unset($xml->languages);
-        unset($xml->media);
-        unset($xml->files);
-        unset($xml->parent);
-        unset($xml->inheritable);
 
         // Remove the update parts
-        unset($xml->update);
-        unset($xml->updateservers);
+        unset(
+            $xml->languages,
+            $xml->media,
+            $xml->files,
+            $xml->parent,
+            $xml->inheritable,
+            $xml->update,
+            $xml->updateservers
+        );
 
         if (isset($xml->creationDate)) {
             $xml->creationDate = (new Date('now'))->format('F Y');

administrator/components/com_users/src/Controller/GroupController.php

@@ -44,7 +44,7 @@ class GroupController extends FormController
      */
     protected function allowSave($data, $key = 'id')
     {
-        return ($this->app->getIdentity()->authorise('core.admin', $this->option) && parent::allowSave($data, $key));
+        return $this->app->getIdentity()->authorise('core.admin', $this->option) && parent::allowSave($data, $key);
     }
 
     /**

administrator/components/com_users/src/Controller/LevelController.php

@@ -47,7 +47,7 @@ class LevelController extends FormController
      */
     protected function allowSave($data, $key = 'id')
     {
-        return ($this->app->getIdentity()->authorise('core.admin', $this->option) && parent::allowSave($data, $key));
+        return $this->app->getIdentity()->authorise('core.admin', $this->option) && parent::allowSave($data, $key);
     }
 
     /**

administrator/index.php

@@ -29,4 +29,4 @@
 \define('_JEXEC', 1);
 
 // Run the application - All executable code should be triggered through this file
-require_once \dirname(__FILE__) . '/includes/app.php';
+require_once __DIR__ . '/includes/app.php';

administrator/modules/mod_feed/src/Helper/FeedHelper.php

@@ -43,7 +43,7 @@ public function getFeedData(Registry $params, FeedFactory $feed): \Joomla\CMS\Fe
         // Get RSS parsed object
         try {
             $rssDoc = $feed->getFeed($rssurl);
-        } catch (\Exception $e) {
+        } catch (\Exception) {
             return Text::_('MOD_FEED_ERR_FEED_NOT_RETRIEVED');
         }