Merge pull request joomla#45068 from richard67/5.4-dev-upmerge-2025-03-04

[5.4] Upmerge changes from 5.3-dev 2025-03-04

Author: richard67

.php-cs-fixer.dist.php

@@ -97,6 +97,8 @@
             'combine_consecutive_issets'                       => true,
             // Calling unset on multiple items should be done in one call
             'combine_consecutive_unsets'                       => true,
+            // There must be no sprintf calls with only the first argument
+            'no_useless_sprintf'                               => true,
         ]
     )
     ->setFinder($finder);

administrator/components/com_actionlogs/src/Model/ActionlogModel.php

@@ -58,7 +58,7 @@ public function addLog($messages, $messageLanguageKey, $context, $userId = 0)
         try {
             $user = $userId ? $this->getUserFactory()->loadUserById($userId) : $this->getCurrentUser();
         } catch (\UnexpectedValueException $e) {
-            @trigger_error(\sprintf('UserFactory must be set, this will not be caught anymore in 7.0.'), E_USER_DEPRECATED);
+            @trigger_error('UserFactory must be set, this will not be caught anymore in 7.0.', E_USER_DEPRECATED);
             $user = Factory::getUser($userId);
         }
 

administrator/components/com_admin/sql/updates/mysql/5.3.0-2025-02-22.sql

@@ -0,0 +1,3 @@
+-- Add plg_extension_joomlaupdate plugin
+INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`) VALUES
+(0, 'plg_extension_joomlaupdate', 'plugin', 'joomlaupdate', 'extension', 0, 1, 1, 0, 1, '', '', '', 0, 0);

administrator/components/com_admin/sql/updates/postgresql/5.3.0-2025-02-22.sql

@@ -0,0 +1,3 @@
+-- Add plg_extension_joomlaupdate module
+INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state") VALUES
+(0, 'plg_extension_joomlaupdate', 'plugin', 'joomlaupdate', 'extension', 0, 1, 1, 0, 1, '', '', '', 0, 0);

administrator/components/com_banners/src/Controller/BannerController.php

@@ -71,7 +71,7 @@ protected function allowAdd($data = [])
      */
     protected function allowEdit($data = [], $key = 'id')
     {
-        $recordId   = (int) isset($data[$key]) ? $data[$key] : 0;
+        $recordId   = isset($data[$key]) ? (int) $data[$key] : 0;
         $categoryId = 0;
 
         if ($recordId) {

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

@@ -91,7 +91,7 @@ protected function allowAdd($data = [])
      */
     protected function allowEdit($data = [], $key = 'parent_id')
     {
-        $recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+        $recordId = isset($data[$key]) ? (int) $data[$key] : 0;
         $user     = $this->app->getIdentity();
 
         // Check "edit" permission on record asset (explicit or inherited)

administrator/components/com_contact/src/Controller/ContactController.php

@@ -63,7 +63,7 @@ protected function allowAdd($data = [])
      */
     protected function allowEdit($data = [], $key = 'id')
     {
-        $recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+        $recordId = isset($data[$key]) ? (int) $data[$key] : 0;
 
         // Since there is no asset tracking, fallback to the component permissions.
         if (!$recordId) {

administrator/components/com_content/src/Controller/ArticleController.php

@@ -159,7 +159,7 @@ protected function allowAdd($data = [])
      */
     protected function allowEdit($data = [], $key = 'id')
     {
-        $recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+        $recordId = isset($data[$key]) ? (int) $data[$key] : 0;
         $user     = $this->app->getIdentity();
 
         // Zero record (id:0), return component edit permission by calling parent controller method

administrator/components/com_fields/src/Controller/FieldController.php

@@ -95,7 +95,7 @@ protected function allowAdd($data = [])
      */
     protected function allowEdit($data = [], $key = 'id')
     {
-        $recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+        $recordId = isset($data[$key]) ? (int) $data[$key] : 0;
         $user     = $this->app->getIdentity();
 
         // Zero record (id:0), return component edit permission by calling parent controller method

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

@@ -117,7 +117,7 @@ protected function allowAdd($data = [])
      */
     protected function allowEdit($data = [], $key = 'parent_id')
     {
-        $recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+        $recordId = isset($data[$key]) ? (int) $data[$key] : 0;
         $user     = $this->app->getIdentity();
 
         // Zero record (parent_id:0), return component edit permission by calling parent controller method