Merge remote-tracking branch 'upstream/5.4-dev' into upmerges/2025-08-27

Author: Bodge-IT

.github/CONTRIBUTING.md

@@ -15,13 +15,12 @@ You are welcome to submit a contribution for review and possible inclusion in th
 Please be patient as not all items will be viewed or tested immediately (remember, all bug testing for the Joomla! CMS is done by volunteers) and be receptive to feedback about your code.
 
 #### Branches
-While 4.4 is in maintenance mode, ie we are still fixing bugs, PRs should be made to the `4.4-dev` branch. Merged bugfixes will be upmerged into the current 5.x branch. If a bug is only in the 5.x series the PR should be made to the current 5.x branch (currently 5.1).
+Joomla 4.4 is in security maintenance mode, until 14th October 2025, which means it will only receive security fixes. Bug fixing PRs should be made to the `5.3-dev` branch. Merged bugfixes will be upmerged into the current branches. New features that do not break backwards compatibility should be made to the `5.4-dev` branch otherwise they should be made to the `6.0-dev` branch.
 
 
 | Branch | Purpose |
 | ------ | ------- |
-| 4.4-dev | Branch for the current 4.x Joomla version. Currently in maintenance mode |
-| 5.1-dev | Branch for the current 5.x Joomla version. Bugfix only for 5.x go into this branch. |
-| 5.2-dev | Branch for the next minor 5.x Joomla version. New features go into this branch. |
+| 4.4-dev | Branch for the current 4.x Joomla version. Currently in security maintenance mode. |
+| 5.3-dev | Branch for the current 5.x Joomla version. Bugfix only for 5.x go into this branch. |
+| 5.4-dev | Branch for the next minor 5.x Joomla version. New features go into this branch. |
 | 6.0-dev | Branch for the next major Joomla version. New features that include a b/c break have to go into this branch. |
-

.github/ISSUE_TEMPLATE.md

@@ -1,2 +1,5 @@
 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_fields_note', 'plugin', 'note', 'fields', 0, 1, 1, 0, 1, '', '{"class":"alert alert-info","heading":"h4"}', '', -1, 0);
+INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`)
+SELECT 0, 'plg_behaviour_compat6', 'plugin', 'compat6', 'behaviour', 0, 1, 1, 0, 1, '', '{"classes_aliases":"1","legacy_classes":"1"}', '', -1, 0
+WHERE NOT EXISTS (SELECT * FROM `#__extensions` e WHERE e.`type` = 'plugin' AND e.`element` = 'compat6' AND e.`folder` = 'behaviour' AND e.`client_id` = 0);

administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-08-16.sql

@@ -1,2 +1,5 @@
 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_fields_note', 'plugin', 'note', 'fields', 0, 1, 1, 0, 1, '', '{"class":"alert alert-info","heading":"h4"}', '', -1, 0);
+INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state")
+SELECT 0, 'plg_behaviour_compat6', 'plugin', 'compat6', 'behaviour', 0, 1, 1, 0, 1, '', '{"classes_aliases":"1","legacy_classes":"1"}', '', -1, 0
+WHERE NOT EXISTS (SELECT * FROM "#__extensions" e WHERE e."type" = 'plugin' AND e."element" = 'compat6' AND e."folder" = 'behaviour' AND e."client_id" = 0);

administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-08-16.sql

@@ -14,7 +14,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Pagination\Pagination;
 use Joomla\CMS\Router\Route;
@@ -223,11 +222,7 @@ public function display($tpl = null): void
     {
         /** @var AssociationModel $model */
         $model = $this->getModel();
-
-        // Check for errors.
-        if (\count($errors = $model->getErrors())) {
-            throw new GenericDataException(implode("\n", $errors), 500);
-        }
+        $model->setUseExceptions(true);
 
         $this->app  = Factory::getApplication();
         $this->form = $model->getForm();

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

@@ -129,6 +129,7 @@ public function display($tpl = null)
     {
         /** @var AssociationsModel $model */
         $model = $this->getModel();
+        $model->setUseExceptions(true);
 
         $this->state         = $model->getState();
         $this->filterForm    = $model->getFilterForm();
@@ -236,11 +237,6 @@ public function display($tpl = null)
             }
         }
 
-        // Check for errors.
-        if (\count($errors = $model->getErrors())) {
-            throw new \Exception(implode("\n", $errors), 500);
-        }
-
         $this->addToolbar();
 
         parent::display($tpl);

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

@@ -220,6 +220,15 @@ public function store($updateNulls = true)
     {
         $db = $this->getDatabase();
 
+        // Verify that the alias is unique
+        $table = new self($db, $this->getDispatcher());
+
+        if ($table->load(['alias' => $this->alias, 'catid' => $this->catid]) && ($table->id != $this->id || $this->id == 0)) {
+            $this->setError(Text::_('COM_BANNERS_ERROR_UNIQUE_ALIAS'));
+
+            return false;
+        }
+
         if (empty($this->id)) {
             $purchaseType = $this->purchase_type;
 
@@ -265,15 +274,6 @@ public function store($updateNulls = true)
                 $this->setError($oldrow->getError());
             }
 
-            // Verify that the alias is unique
-            $table = new self($db, $this->getDispatcher());
-
-            if ($table->load(['alias' => $this->alias, 'catid' => $this->catid]) && ($table->id != $this->id || $this->id == 0)) {
-                $this->setError(Text::_('COM_BANNERS_ERROR_UNIQUE_ALIAS'));
-
-                return false;
-            }
-
             // Store the new row
             parent::store($updateNulls);
 

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

@@ -73,7 +73,7 @@ protected function initializeView()
         parent::initializeView();
 
         /** @var BannersModel $model */
-        $model               = $this->getModel();
+        $model            = $this->getModel();
 
         $this->categories = $model->getCategoryOrders();
         $this->canDo      = ContentHelper::getActions('com_banners', 'category', $this->state->get('filter.category_id'));

administrator/components/com_banners/src/View/Banners/HtmlView.php

@@ -13,7 +13,6 @@
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Pagination\Pagination;
 use Joomla\CMS\Toolbar\ToolbarHelper;
@@ -92,7 +91,9 @@ class HtmlView extends BaseHtmlView
     public function display($tpl = null): void
     {
         /** @var ClientsModel $model */
-        $model               = $this->getModel();
+        $model = $this->getModel();
+        $model->setUseExceptions(true);
+
         $this->items         = $model->getItems();
         $this->pagination    = $model->getPagination();
         $this->state         = $model->getState();
@@ -103,11 +104,6 @@ public function display($tpl = null): void
             $this->setLayout('emptystate');
         }
 
-        // Check for errors.
-        if (\count($errors = $model->getErrors())) {
-            throw new GenericDataException(implode("\n", $errors), 500);
-        }
-
         $this->addToolbar();
 
         // Add form control fields

administrator/components/com_banners/src/View/Clients/HtmlView.php

@@ -11,7 +11,6 @@
 namespace Joomla\Component\Banners\Administrator\View\Download;
 
 use Joomla\CMS\Form\Form;
-use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\Component\Banners\Administrator\Model\DownloadModel;
 
@@ -48,13 +47,10 @@ class HtmlView extends BaseHtmlView
     public function display($tpl = null): void
     {
         /** @var DownloadModel $model */
-        $model      = $this->getModel();
-        $this->form = $model->getForm();
+        $model = $this->getModel();
+        $model->setUseExceptions(true);
 
-        // Check for errors.
-        if (\count($errors = $model->getErrors())) {
-            throw new GenericDataException(implode("\n", $errors), 500);
-        }
+        $this->form = $model->getForm();
 
         parent::display($tpl);
     }