Merge pull request joomla#45035 from richard67/5.4-dev-upmerge-2025-02-28

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

Author: richard67

.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');
         }