Merge branch '5.1-dev' into 5.1/plugins/webservices/events

joomla · Mar 4, 2024 · 4d00db8 · 4d00db8
2 parents 96c46e4 + 6ee8ada
commit 4d00db8
Show file tree

Hide file tree

Showing 239 changed files with 828 additions and 222 deletions.
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -2208,6 +2208,31 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             // From 5.1.0-alpha3 to 5.1.0-alpha4
             '/administrator/components/com_redirect/tmpl/links/default_batch_footer.php',
             '/modules/mod_banners/mod_banners.php',
+            // From 5.1.0-alpha4 to 5.1.0-beta1
+            '/administrator/modules/mod_custom/mod_custom.php',
+            '/administrator/modules/mod_frontend/mod_frontend.php',
+            '/administrator/modules/mod_latestactions/mod_latestactions.php',
+            '/administrator/modules/mod_loginsupport/mod_loginsupport.php',
+            '/administrator/modules/mod_messages/mod_messages.php',
+            '/administrator/modules/mod_multilangstatus/mod_multilangstatus.php',
+            '/administrator/modules/mod_sampledata/mod_sampledata.php',
+            '/administrator/modules/mod_stats_admin/mod_stats_admin.php',
+            '/administrator/modules/mod_title/mod_title.php',
+            '/administrator/modules/mod_toolbar/mod_toolbar.php',
+            '/administrator/modules/mod_user/mod_user.php',
+            '/administrator/modules/mod_version/mod_version.php',
+            '/media/plg_system_jooa11y/css/jooa11y.css',
+            '/media/plg_system_jooa11y/css/jooa11y.min.css',
+            '/media/plg_system_jooa11y/css/jooa11y.min.css.gz',
+            '/media/plg_system_jooa11y/scss/jooa11y.scss',
+            '/media/vendor/joomla-a11y-checker/LICENSE.md',
+            '/modules/mod_feed/mod_feed.php',
+            '/modules/mod_languages/mod_languages.php',
+            '/modules/mod_stats/mod_stats.php',
+            '/modules/mod_syndicate/mod_syndicate.php',
+            '/modules/mod_tags_popular/mod_tags_popular.php',
+            '/modules/mod_tags_similar/mod_tags_similar.php',
+            '/modules/mod_wrapper/mod_wrapper.php',
         ];
 
         $folders = [
@@ -2442,6 +2467,10 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/libraries/vendor/fgrosse/phpasn1/lib',
             '/libraries/vendor/fgrosse/phpasn1',
             '/libraries/vendor/fgrosse',
+            // From 5.1.0-alpha4 to 5.1.0-beta1
+            '/media/vendor/joomla-a11y-checker',
+            '/media/plg_system_jooa11y/scss',
+            '/media/plg_system_jooa11y/css',
         ];
 
         $status['files_checked']   = $files;

diff --git a/administrator/components/com_admin/tmpl/help/langforum.php b/administrator/components/com_admin/tmpl/help/langforum.php
@@ -13,6 +13,8 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 
+/** @var \Joomla\Component\Admin\Administrator\View\Help\HtmlView $this */
+
 $this->getLanguage()->load('mod_menu', JPATH_ADMINISTRATOR);
 
 $forumId   = (int) Text::_('MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE');

diff --git a/administrator/components/com_associations/layouts/joomla/searchtools/default.php b/administrator/components/com_associations/layouts/joomla/searchtools/default.php
@@ -15,6 +15,8 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
 
+/** @var \Joomla\CMS\Layout\FileLayout $this */
+
 $data = $displayData;
 
 // Receive overridable options

diff --git a/administrator/components/com_associations/tmpl/associations/default.php b/administrator/components/com_associations/tmpl/associations/default.php
@@ -16,6 +16,8 @@
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
 
+/** @var Joomla\Component\Associations\Administrator\View\Associations\HtmlView $this */
+
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->document->getWebAssetManager();
 $wa->useScript('com_associations.admin-associations-default')

diff --git a/administrator/components/com_associations/tmpl/associations/modal.php b/administrator/components/com_associations/tmpl/associations/modal.php
@@ -18,6 +18,8 @@
 use Joomla\CMS\Session\Session;
 use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
 
+/** @var Joomla\Component\Associations\Administrator\View\Associations\HtmlView $this */
+
 $app = Factory::getApplication();
 
 if ($app->isClient('site')) {

diff --git a/administrator/components/com_banners/tmpl/banners/emptystate.php b/administrator/components/com_banners/tmpl/banners/emptystate.php
@@ -12,6 +12,8 @@
 
 use Joomla\CMS\Layout\LayoutHelper;
 
+/** @var \Joomla\Component\Banners\Administrator\View\Banners\HtmlView $this */
+
 $displayData = [
     'textPrefix' => 'COM_BANNERS',
     'formURL'    => 'index.php?option=com_banners&view=banners',

diff --git a/administrator/components/com_banners/tmpl/clients/default.php b/administrator/components/com_banners/tmpl/clients/default.php
@@ -71,22 +71,30 @@
                                 <th scope="col" class="w-15 d-none d-md-table-cell">
                                     <?php echo HTMLHelper::_('searchtools.sort', 'COM_BANNERS_HEADING_CONTACT', 'a.contact', $listDirn, $listOrder); ?>
                                 </th>
-                                <th scope="col" class="w-3 text-center d-none d-md-table-cell">
-                                    <span class="icon-check" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?>"></span>
-                                    <span class="visually-hidden"><?php echo Text::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?></span>
-                                </th>
-                                <th scope="col" class="w-3 text-center d-none d-md-table-cell">
-                                    <span class="icon-times" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?>"></span>
-                                    <span class="visually-hidden"><?php echo Text::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?></span>
-                                </th>
-                                <th scope="col" class="w-3 text-center d-none d-md-table-cell">
-                                    <span class="icon-folder icon-fw" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?>"></span>
-                                    <span class="visually-hidden"><?php echo Text::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?></span>
-                                </th>
-                                <th scope="col" class="w-3 text-center d-none d-md-table-cell">
-                                    <span class="icon-trash" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?>"></span>
-                                    <span class="visually-hidden"><?php echo Text::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?></span>
-                                </th>
+                                <?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_published')) : ?>
+                                    <th scope="col" class="w-10 text-center d-none d-md-table-cell">
+                                        <span class="icon-check" aria-hidden="true"></span>
+                                        <span class="d-none d-lg-inline"><?php echo Text::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?></span>
+                                    </th>
+                                <?php endif; ?>
+                                <?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_unpublished')) : ?>
+                                    <th scope="col" class="w-10 text-center d-none d-md-table-cell">
+                                        <span class="icon-times" aria-hidden="true"></span>
+                                        <span class="d-none d-lg-inline"><?php echo Text::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?></span>
+                                    </th>
+                                <?php endif; ?>
+                                <?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_archived')) : ?>
+                                    <th scope="col" class="w-10 text-center d-none d-md-table-cell">
+                                        <span class="icon-folder icon-fw" aria-hidden="true"></span>
+                                        <span class="d-none d-lg-inline"><?php echo Text::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?></span>
+                                    </th>
+                                <?php endif; ?>
+                                <?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_trashed')) : ?>
+                                    <th scope="col" class="w-10 text-center d-none d-md-table-cell">
+                                        <span class="icon-trash" aria-hidden="true"></span>
+                                        <span class="d-none d-lg-inline"><?php echo Text::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?></span>
+                                    </th>
+                                <?php endif; ?>
                                 <th scope="col" class="w-10 d-none d-md-table-cell">
                                     <?php echo HTMLHelper::_('searchtools.sort', 'COM_BANNERS_HEADING_PURCHASETYPE', 'a.purchase_type', $listDirn, $listOrder); ?>
                                 </th>

diff --git a/administrator/components/com_banners/tmpl/clients/emptystate.php b/administrator/components/com_banners/tmpl/clients/emptystate.php
@@ -12,6 +12,8 @@
 
 use Joomla\CMS\Layout\LayoutHelper;
 
+/** @var \Joomla\Component\Banners\Administrator\View\Clients\HtmlView $this */
+
 $displayData = [
     'textPrefix' => 'COM_BANNERS_CLIENT',
     'formURL'    => 'index.php?option=com_banners&view=clients',

diff --git a/administrator/components/com_banners/tmpl/tracks/default.php b/administrator/components/com_banners/tmpl/tracks/default.php
@@ -15,6 +15,8 @@
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 
+/** @var \Joomla\Component\Banners\Administrator\View\Tracks\HtmlView $this */
+
 /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->document->getWebAssetManager();
 $wa->useScript('table.columns');

diff --git a/administrator/components/com_categories/layouts/joomla/form/field/categoryedit.php b/administrator/components/com_categories/layouts/joomla/form/field/categoryedit.php
@@ -14,6 +14,8 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 
+/** @var \Joomla\CMS\Layout\FileLayout $this */
+
 extract($displayData);
 
 /**

diff --git a/...trator/components/com_categories/layouts/joomla/form/field/modal-select/extra-buttons.php b/...trator/components/com_categories/layouts/joomla/form/field/modal-select/extra-buttons.php
@@ -13,6 +13,8 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 
+/** @var \Joomla\CMS\Layout\FileLayout $this */
+
 extract($displayData);
 
 /**