Merge branch '5.2-dev' into 5.1/php84/implicitly-nullable-parameter

joomla · May 17, 2024 · 673d5ef · 673d5ef
2 parents d9f6599 + 5580224
commit 673d5ef
Show file tree

Hide file tree

Showing 254 changed files with 2,580 additions and 2,066 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -272,7 +272,7 @@ volumes:
 
 services:
   - name: mysql
-    image: mysql:8
+    image: mysql:8.0
     command: ["--default-authentication-plugin=mysql_native_password"]
     environment:
       MYSQL_USER: joomla_ut
@@ -405,7 +405,6 @@ steps:
       status:
         - failure
 
-
 trigger:
   event:
     - cron
@@ -415,6 +414,6 @@ trigger:
 
 ---
 kind: signature
-hmac: 90d71e1cf5e5dcdb753ea1da6f8b6e571fc82a47994bd856e83c5f30bdd4a2af
+hmac: 8f1bbc362aaadc6b7506490a1ff865bc9ccc0aada27104646963e9b44ee22bef
 
 ...
diff --git a/administrator/components/com_actionlogs/src/Model/ActionlogsModel.php b/administrator/components/com_actionlogs/src/Model/ActionlogsModel.php
@@ -18,8 +18,8 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Database\DatabaseIterator;
-use Joomla\Database\DatabaseQuery;
 use Joomla\Database\ParameterType;
+use Joomla\Database\QueryInterface;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -79,7 +79,7 @@ protected function populateState($ordering = 'a.id', $direction = 'desc')
     /**
      * Build an SQL query to load the list data.
      *
-     * @return  DatabaseQuery
+     * @return  QueryInterface
      *
      * @since   3.9.0
      *
@@ -298,7 +298,7 @@ public function getLogDataAsIterator($pks = null)
      *
      * @param   integer[]|null  $pks  An optional array of log record IDs to load
      *
-     * @return  DatabaseQuery
+     * @return  QueryInterface
      *
      * @since   3.9.0
      */

diff --git a/administrator/components/com_associations/src/Model/AssociationsModel.php b/administrator/components/com_associations/src/Model/AssociationsModel.php
@@ -18,6 +18,7 @@
 use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
 use Joomla\Database\Exception\ExecutionFailureException;
 use Joomla\Database\ParameterType;
+use Joomla\Database\QueryInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -152,7 +153,7 @@ protected function getStoreId($id = '')
     /**
      * Build an SQL query to load the list data.
      *
-     * @return  \Joomla\Database\DatabaseQuery|boolean
+     * @return  QueryInterface|boolean
      *
      * @since  3.7.0
      */

diff --git a/administrator/components/com_banners/src/Model/BannersModel.php b/administrator/components/com_banners/src/Model/BannersModel.php
@@ -14,6 +14,7 @@
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\CMS\Table\Table;
 use Joomla\Database\ParameterType;
+use Joomla\Database\QueryInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -94,7 +95,7 @@ public function &getCategoryOrders()
     /**
      * Build an SQL query to load the list data.
      *
-     * @return  \Joomla\Database\DatabaseQuery
+     * @return  QueryInterface
      *
      * @since   1.6
      */

diff --git a/administrator/components/com_banners/src/Model/ClientsModel.php b/administrator/components/com_banners/src/Model/ClientsModel.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Database\ParameterType;
+use Joomla\Database\QueryInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -94,7 +95,7 @@ protected function getStoreId($id = '')
     /**
      * Build an SQL query to load the list data.
      *
-     * @return  \Joomla\Database\DatabaseQuery
+     * @return  QueryInterface
      */
     protected function getListQuery()
     {

diff --git a/administrator/components/com_banners/src/Model/TracksModel.php b/administrator/components/com_banners/src/Model/TracksModel.php
@@ -16,6 +16,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Database\ParameterType;
+use Joomla\Database\QueryInterface;
 use Joomla\Filesystem\File;
 use Joomla\Filesystem\Folder;
 use Joomla\String\StringHelper;
@@ -87,7 +88,7 @@ protected function populateState($ordering = 'b.name', $direction = 'asc')
     /**
      * Build an SQL query to load the list data.
      *
-     * @return  \Joomla\Database\DatabaseQuery
+     * @return  QueryInterface
      *
      * @since   1.6
      */

diff --git a/administrator/components/com_banners/tmpl/banners/default.php b/administrator/components/com_banners/tmpl/banners/default.php
@@ -25,7 +25,7 @@
     ->useScript('multiselect');
 
 $user      = $this->getCurrentUser();
-$userId    = $user->get('id');
+$userId    = $user->id;
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 $saveOrder = $listOrder == 'a.ordering';

diff --git a/administrator/components/com_banners/tmpl/banners/emptystate.php b/administrator/components/com_banners/tmpl/banners/emptystate.php
@@ -17,7 +17,7 @@
 $displayData = [
     'textPrefix' => 'COM_BANNERS',
     'formURL'    => 'index.php?option=com_banners&view=banners',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help40:Banners',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Banners',
     'icon'       => 'icon-bookmark banners',
 ];
 

diff --git a/administrator/components/com_banners/tmpl/clients/default.php b/administrator/components/com_banners/tmpl/clients/default.php
@@ -32,7 +32,7 @@
 ];
 
 $user       = $this->getCurrentUser();
-$userId     = $user->get('id');
+$userId     = $user->id;
 $listOrder  = $this->escape($this->state->get('list.ordering'));
 $listDirn   = $this->escape($this->state->get('list.direction'));
 $params     = $this->state->get('params') ?? new Registry();
@@ -107,7 +107,7 @@
                             <?php foreach ($this->items as $i => $item) :
                                 $canCreate  = $user->authorise('core.create', 'com_banners');
                                 $canEdit    = $user->authorise('core.edit', 'com_banners');
-                                $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->get('id') || is_null($item->checked_out);
+                                $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || is_null($item->checked_out);
                                 $canChange  = $user->authorise('core.edit.state', 'com_banners') && $canCheckin;
                                 ?>
                                 <tr class="row<?php echo $i % 2; ?>">

diff --git a/administrator/components/com_banners/tmpl/clients/emptystate.php b/administrator/components/com_banners/tmpl/clients/emptystate.php
@@ -17,7 +17,7 @@
 $displayData = [
     'textPrefix' => 'COM_BANNERS_CLIENT',
     'formURL'    => 'index.php?option=com_banners&view=clients',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help40:Banners:_Clients',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Banners:_Clients',
     'icon'       => 'icon-bookmark banners',
 ];
 

diff --git a/administrator/components/com_banners/tmpl/tracks/emptystate.php b/administrator/components/com_banners/tmpl/tracks/emptystate.php
@@ -14,7 +14,7 @@
 
 $displayData = [
     'textPrefix' => 'COM_BANNERS_TRACKS',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help40:Banners:_Tracks',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Banners:_Tracks',
     'icon'       => 'icon-bookmark banners',
 ];
 

diff --git a/administrator/components/com_categories/src/Model/CategoriesModel.php b/administrator/components/com_categories/src/Model/CategoriesModel.php
@@ -17,8 +17,8 @@
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\CMS\Table\Table;
-use Joomla\Database\DatabaseQuery;
 use Joomla\Database\ParameterType;
+use Joomla\Database\QueryInterface;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -156,7 +156,7 @@ protected function getStoreId($id = '')
     /**
      * Method to get a database query to list categories.
      *
-     * @return  \Joomla\Database\DatabaseQuery
+     * @return  QueryInterface
      *
      * @since   1.6
      */
@@ -493,7 +493,7 @@ public function countItems(&$items, $extension)
     /**
      * Manipulate the query to be used to evaluate if this is an Empty State to provide specific conditions for this extension.
      *
-     * @return DatabaseQuery
+     * @return QueryInterface
      *
      * @since 4.0.0
      */

diff --git a/administrator/components/com_categories/tmpl/categories/default.php b/administrator/components/com_categories/tmpl/categories/default.php
@@ -26,7 +26,7 @@
     ->useScript('multiselect');
 
 $user      = $this->getCurrentUser();
-$userId    = $user->get('id');
+$userId    = $user->id;
 $extension = $this->escape($this->state->get('filter.extension'));
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));

diff --git a/administrator/components/com_checkin/tmpl/checkin/emptystate.php b/administrator/components/com_checkin/tmpl/checkin/emptystate.php
@@ -15,7 +15,7 @@
 
 $displayData = [
     'textPrefix' => 'COM_CHECKIN',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help4.x:Maintenance:_Global_Check-in',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Maintenance:_Global_Check-in',
     'icon'       => 'icon-check-square',
     'title'      => Text::_('COM_CHECKIN_GLOBAL_CHECK_IN'),
 ];

diff --git a/administrator/components/com_config/src/Model/ApplicationModel.php b/administrator/components/com_config/src/Model/ApplicationModel.php
@@ -374,7 +374,7 @@ public function save($data)
 
             // Check that we aren't removing our Super User permission
             // Need to get groups from database, since they might have changed
-            $myGroups      = Access::getGroupsByUser($this->getCurrentUser()->get('id'));
+            $myGroups      = Access::getGroupsByUser($this->getCurrentUser()->id);
             $myRules       = $rules->getData();
             $hasSuperAdmin = $myRules['core.admin']->allow($myGroups);
 

diff --git a/administrator/components/com_contact/src/Model/ContactsModel.php b/administrator/components/com_contact/src/Model/ContactsModel.php
@@ -15,6 +15,7 @@
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\CMS\Table\Table;
 use Joomla\Database\ParameterType;
+use Joomla\Database\QueryInterface;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -135,7 +136,7 @@ protected function getStoreId($id = '')
     /**
      * Build an SQL query to load the list data.
      *
-     * @return  \Joomla\Database\DatabaseQuery
+     * @return  QueryInterface
      *
      * @since   1.6
      */

diff --git a/administrator/components/com_contact/src/Service/HTML/Icon.php b/administrator/components/com_contact/src/Service/HTML/Icon.php
@@ -118,7 +118,7 @@ public function edit($contact, $params, $attribs = [], $legacy = false)
             property_exists($contact, 'checked_out')
             && property_exists($contact, 'checked_out_time')
             && !\is_null($contact->checked_out)
-            && $contact->checked_out !== $user->get('id')
+            && $contact->checked_out !== $user->id
         ) {
             $checkoutUser = $this->getUserFactory()->loadUserById($contact->checked_out);
             $date         = HTMLHelper::_('date', $contact->checked_out_time);

diff --git a/administrator/components/com_contact/src/Table/ContactTable.php b/administrator/components/com_contact/src/Table/ContactTable.php
@@ -48,7 +48,7 @@ class ContactTable extends Table implements VersionableTableInterface, TaggableT
     protected $_supportNullValue = true;
 
     /**
-     * Ensure the params and metadata in json encoded in the bind method
+     * Ensure the params and metadata are json encoded in the bind method
      *
      * @var    array
      * @since  3.3

diff --git a/administrator/components/com_contact/tmpl/contacts/default.php b/administrator/components/com_contact/tmpl/contacts/default.php
@@ -26,7 +26,7 @@
     ->useScript('multiselect');
 
 $user      = $this->getCurrentUser();
-$userId    = $user->get('id');
+$userId    = $user->id;
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 $saveOrder = $listOrder == 'a.ordering';

diff --git a/administrator/components/com_contact/tmpl/contacts/emptystate.php b/administrator/components/com_contact/tmpl/contacts/emptystate.php
@@ -17,7 +17,7 @@
 $displayData = [
     'textPrefix' => 'COM_CONTACT',
     'formURL'    => 'index.php?option=com_contact',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help4.x:Contacts',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Contacts',
     'icon'       => 'icon-address-book contact',
 ];
 

diff --git a/administrator/components/com_content/src/Model/ArticlesModel.php b/administrator/components/com_content/src/Model/ArticlesModel.php
@@ -19,6 +19,7 @@
 use Joomla\CMS\Table\Table;
 use Joomla\Component\Content\Administrator\Extension\ContentComponent;
 use Joomla\Database\ParameterType;
+use Joomla\Database\QueryInterface;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 
@@ -217,7 +218,7 @@ protected function getStoreId($id = '')
     /**
      * Build an SQL query to load the list data.
      *
-     * @return  \Joomla\Database\DatabaseQuery
+     * @return  QueryInterface
      *
      * @since   1.6
      */

diff --git a/administrator/components/com_content/src/Model/FeaturedModel.php b/administrator/components/com_content/src/Model/FeaturedModel.php
@@ -11,6 +11,8 @@
 namespace Joomla\Component\Content\Administrator\Model;
 
 // phpcs:disable PSR1.Files.SideEffects
+use Joomla\Database\QueryInterface;
+
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
@@ -88,7 +90,7 @@ protected function populateState($ordering = 'a.title', $direction = 'asc')
     /**
      * Build an SQL query to load the list data.
      *
-     * @return  \Joomla\Database\DatabaseQuery
+     * @return  QueryInterface
      *
      * @since   4.0.0
      */

diff --git a/administrator/components/com_content/src/Service/HTML/Icon.php b/administrator/components/com_content/src/Service/HTML/Icon.php
@@ -104,7 +104,7 @@ public function edit($article, $params, $attribs = [], $legacy = false)
             property_exists($article, 'checked_out')
             && property_exists($article, 'checked_out_time')
             && !\is_null($article->checked_out)
-            && $article->checked_out != $user->get('id')
+            && $article->checked_out != $user->id
         ) {
             $checkoutUser = Factory::getUser($article->checked_out);
             $date         = HTMLHelper::_('date', $article->checked_out_time);

diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php
@@ -34,7 +34,7 @@
 
 $app       = Factory::getApplication();
 $user      = $this->getCurrentUser();
-$userId    = $user->get('id');
+$userId    = $user->id;
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 $saveOrder = $listOrder == 'a.ordering';

diff --git a/administrator/components/com_content/tmpl/featured/default.php b/administrator/components/com_content/tmpl/featured/default.php
@@ -34,7 +34,7 @@
 
 $app       = Factory::getApplication();
 $user      = $this->getCurrentUser();
-$userId    = $user->get('id');
+$userId    = $user->id;
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 $saveOrder = $listOrder == 'fp.ordering';

diff --git a/administrator/components/com_contenthistory/src/Model/HistoryModel.php b/administrator/components/com_contenthistory/src/Model/HistoryModel.php
@@ -22,6 +22,7 @@
 use Joomla\CMS\Table\ContentType;
 use Joomla\CMS\Table\Table;
 use Joomla\Database\ParameterType;
+use Joomla\Database\QueryInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -317,7 +318,7 @@ protected function populateState($ordering = 'h.save_date', $direction = 'DESC')
     /**
      * Build an SQL query to load the list data.
      *
-     * @return  \Joomla\Database\DatabaseQuery
+     * @return  QueryInterface
      *
      * @since   3.2
      */

diff --git a/administrator/components/com_fields/forms/field.xml b/administrator/components/com_fields/forms/field.xml
@@ -81,7 +81,6 @@
 			label="COM_FIELDS_FIELD_ONLY_USE_IN_SUBFORM_LABEL"
 			layout="joomla.form.field.radio.switcher"
 			default="0"
-			showon="type!:subform"
 			>
 			<option value="0">JNO</option>
 			<option value="1">JYES</option>

diff --git a/administrator/components/com_fields/src/Field/SubfieldsField.php b/administrator/components/com_fields/src/Field/SubfieldsField.php
@@ -75,11 +75,6 @@ protected function getOptions()
 
         // Iterate over the custom fields for this context
         foreach (static::$customFieldsCache[$this->context] as $customField) {
-            // Skip our own subform type. We won't have subform in subform.
-            if ($customField->type == 'subform') {
-                continue;
-            }
-
             $options[] = HTMLHelper::_(
                 'select.option',
                 $customField->id,