joomla · richard67 · Oct 23, 2024 · Oct 11, 2024 · Oct 15, 2024 · Oct 15, 2024
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -6,7 +6,6 @@ plugins/content/finder/*  @hackwar
 plugins/finder/*  @hackwar
 
 # Release Tools
-build.xml  @fancyFranci
 build/build.php  @rdeutz
 build/bump.php  @rdeutz
 build/deleted_file_check.php  @rdeutz
@@ -17,12 +16,12 @@ libraries/src/Installer/*  @rdeutz
 libraries/src/Updater/*  @rdeutz
 
 # Automated Testing
-tests/*  @hackwar @fancyFranci
-tests/Unit/*  @rdeutz @fancyFranci
-.appveyor.yml  @rdeutz @hackwar @fancyFranci
-.drone.yml  @rdeutz @hackwar @fancyFranci
-phpunit.xml.dist  @rdeutz @hackwar @fancyFranci
-phpunit-pgsql.xml.dist  @rdeutz @hackwar @fancyFranci
+tests/*  @hackwar @laoneo
+tests/Unit/*  @rdeutz @laoneo
+.appveyor.yml  @rdeutz @hackwar @laoneo
+.drone.yml  @rdeutz @hackwar @laoneo
+phpunit.xml.dist  @rdeutz @hackwar @laoneo
+phpunit-pgsql.xml.dist  @rdeutz @hackwar @laoneo
 
 # Workflow
 administrator/components/com_workflow/*	@bembelimen @hleithner

diff --git a/README.md b/README.md
@@ -1,14 +1,11 @@
 Joomla! CMS™
 ====================
 
-The Joomla! 5.2 branch is under heavy development and not all links in this document are available yet
-------------------------------------------------------------------------------------------------------
-
 Build Status
 
 | Drone-CI                                                                                                                                 | AppVeyor                                                                                                                                                           | PHP                                                                           | Node                                                                                 | npm                                                                             |
 |------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------|--------------------------------------------------------------------------------------|---------------------------------------------------------------------------------|
-| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=5.2-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/5.2-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.1.0-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V18.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v9.6.7-green)](https://nodejs.org/en/) |
+| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=5.2-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/5.2-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.1.0-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V20.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v10.1.0-green)](https://nodejs.org/en/) |
 
 Overview
 ---------------------

diff --git a/README.txt b/README.txt
@@ -1,8 +1,5 @@
 Joomla! CMS™
 
-The Joomla! 5.2 branch is under heavy development and not all links in this document are available yet
-------------------------------------------------------------------------------------------------------
-
 1- Overview
 	* This is a Joomla! 5.x installation/upgrade package.
 	* Joomla! Official site: https://www.joomla.org

diff --git a/administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-09-24.sql b/administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-09-24.sql
@@ -0,0 +1,7 @@
+UPDATE `#__assets` SET `title` = 'PUBLISH' WHERE `name` LIKE 'com_content.transition.%' AND `title` = 'Publish';
+UPDATE `#__assets` SET `title` = 'UNPUBLISH' WHERE `name` LIKE 'com_content.transition.%' AND `title` = 'Unpublish';
+UPDATE `#__assets` SET `title` = 'TRASH' WHERE `name` LIKE 'com_content.transition.%' AND `title` = 'Trash';
+UPDATE `#__assets` SET `title` = 'ARCHIVE' WHERE `name` LIKE 'com_content.transition.%' AND `title` = 'Archive';
+UPDATE `#__assets` SET `title` = 'FEATURE' WHERE `name` LIKE 'com_content.transition.%' AND `title` = 'Feature';
+UPDATE `#__assets` SET `title` = 'UNFEATURE' WHERE `name` LIKE 'com_content.transition.%' AND `title` = 'Unfeature';
+UPDATE `#__assets` SET `title` = 'PUBLISH_AND_FEATURE' WHERE `name` LIKE 'com_content.transition.%' AND `title` = 'Publish & Feature';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-09-24.sql b/administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-09-24.sql
@@ -0,0 +1,7 @@
+UPDATE "#__assets" SET "title" = 'PUBLISH' WHERE "name" LIKE 'com_content.transition.%' AND "title" = 'Publish';
+UPDATE "#__assets" SET "title" = 'UNPUBLISH' WHERE "name" LIKE 'com_content.transition.%' AND "title" = 'Unpublish';
+UPDATE "#__assets" SET "title" = 'TRASH' WHERE "name" LIKE 'com_content.transition.%' AND "title" = 'Trash';
+UPDATE "#__assets" SET "title" = 'ARCHIVE' WHERE "name" LIKE 'com_content.transition.%' AND "title" = 'Archive';
+UPDATE "#__assets" SET "title" = 'FEATURE' WHERE "name" LIKE 'com_content.transition.%' AND "title" = 'Feature';
+UPDATE "#__assets" SET "title" = 'UNFEATURE' WHERE "name" LIKE 'com_content.transition.%' AND "title" = 'Unfeature';
+UPDATE "#__assets" SET "title" = 'PUBLISH_AND_FEATURE' WHERE "name" LIKE 'com_content.transition.%' AND "title" = 'Publish & Feature';
diff --git a/administrator/components/com_content/src/Model/FeaturedModel.php b/administrator/components/com_content/src/Model/FeaturedModel.php
@@ -10,9 +10,9 @@
 
 namespace Joomla\Component\Content\Administrator\Model;
 
-// phpcs:disable PSR1.Files.SideEffects
 use Joomla\Database\QueryInterface;
 
+// phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 

diff --git a/administrator/components/com_menus/tmpl/items/default_batch_body.php b/administrator/components/com_menus/tmpl/items/default_batch_body.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
@@ -24,7 +23,6 @@
 ];
 $published = (int) $this->state->get('filter.published');
 $clientId  = (int) $this->state->get('filter.client_id');
-$menuType  = Factory::getApplication()->getUserState('com_menus.items.menutype', '');
 
 if ($clientId == 1) {
     /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
@@ -34,23 +32,22 @@
 }
 ?>
 <div class="p-3">
-    <?php if (strlen($menuType) && $menuType != '*') : ?>
-        <?php if ($clientId != 1) : ?>
-    <div class="row">
+    <?php if ($clientId != 1) : ?>
+        <div class="row">
             <?php if (Multilanguage::isEnabled()) : ?>
+                <div class="form-group col-md-6">
+                    <div class="controls">
+                        <?php echo LayoutHelper::render('joomla.html.batch.language', []); ?>
+                    </div>
+                </div>
+            <?php endif; ?>
             <div class="form-group col-md-6">
                 <div class="controls">
-                    <?php echo LayoutHelper::render('joomla.html.batch.language', []); ?>
+                    <?php echo LayoutHelper::render('joomla.html.batch.access', []); ?>
                 </div>
             </div>
-            <?php endif; ?>
-        <div class="form-group col-md-6">
-            <div class="controls">
-                <?php echo LayoutHelper::render('joomla.html.batch.access', []); ?>
-            </div>
         </div>
-    </div>
-        <?php endif; ?>
+    <?php endif; ?>
     <div class="row">
         <?php if ($published >= 0) : ?>
             <div class="form-group col-md-6">
@@ -82,17 +79,12 @@
             <p><?php echo Text::_('COM_MENUS_SELECT_MENU_FILTER_NOT_TRASHED'); ?></p>
         <?php endif; ?>
     </div>
-    <?php else : ?>
-    <div class="row">
-        <p><?php echo Text::_('COM_MENUS_SELECT_MENU_FIRST'); ?></p>
-    </div>
-    <?php endif; ?>
-</div>
-<?php if ((strlen($menuType) && $menuType != '*' && $clientId == 0) || ($published >= 0 && $clientId == 1)) : ?>
-<div class="btn-toolbar p-3">
-    <joomla-toolbar-button task="item.batch" class="ms-auto">
-        <button type="button" class="btn btn-success"><?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?></button>
-    </joomla-toolbar-button>
 </div>
+<?php if ($clientId == 0 || ($published >= 0 && $clientId == 1)) : ?>
+    <div class="btn-toolbar p-3">
+        <joomla-toolbar-button task="item.batch" class="ms-auto">
+            <button type="button" class="btn btn-success"><?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?></button>
+        </joomla-toolbar-button>
+    </div>
 <?php endif; ?>
 
diff --git a/administrator/components/com_privacy/tmpl/consents/default.php b/administrator/components/com_privacy/tmpl/consents/default.php
@@ -34,6 +34,7 @@
     0 => Text::_('COM_PRIVACY_CONSENTS_STATE_OBSOLETE'),
     1 => Text::_('COM_PRIVACY_CONSENTS_STATE_VALID')
 ];
+$this->getLanguage()->load('plg_system_privacyconsent', JPATH_ADMINISTRATOR);
 
 ?>
 <form action="<?php echo Route::_('index.php?option=com_privacy&view=consents'); ?>" method="post" name="adminForm" id="adminForm">

diff --git a/administrator/language/en-GB/com_menus.ini b/administrator/language/en-GB/com_menus.ini
@@ -176,6 +176,7 @@ COM_MENUS_SELECT_A_MENUITEM="Select a Menu Item"
 COM_MENUS_SELECT_MENU="- Select Menu -"
 COM_MENUS_SELECT_MENU_FILTER="Select Menu"
 COM_MENUS_SELECT_MENU_FILTER_NOT_TRASHED="Filter the list by a state other than trashed or clear the filter."
+; Deprecated, will be removed with 6.0
 COM_MENUS_SELECT_MENU_FIRST="To use batch processing, please first select a Menu in the manager."
 COM_MENUS_SELECT_MENU_FIRST_EXPORT="To use export, please first select a valid Menu in the manager."
 COM_MENUS_SUBMENU_ITEMS="Menu Items"

diff --git a/administrator/language/en-GB/mod_guidedtours.sys.ini b/administrator/language/en-GB/mod_guidedtours.sys.ini
@@ -4,4 +4,5 @@
 ; Note : All ini files need to be saved as UTF-8
 
 MOD_GUIDEDTOURS="Guided Tours"
+MOD_GUIDEDTOURS_LAYOUT_DEFAULT="Default"
 MOD_GUIDEDTOURS_XML_DESCRIPTION="This module shows a list of the available guided tours."
diff --git a/administrator/language/en-GB/mod_latestactions.sys.ini b/administrator/language/en-GB/mod_latestactions.sys.ini
@@ -4,4 +4,5 @@
 ; Note : All ini files need to be saved as UTF-8
 
 MOD_LATESTACTIONS="Action Logs - Latest"
+MOD_LATESTACTIONS_LAYOUT_DEFAULT="Default"
 MOD_LATESTACTIONS_XML_DESCRIPTION="This module shows a list of the most recent actions."
diff --git a/administrator/language/en-GB/mod_logged.sys.ini b/administrator/language/en-GB/mod_logged.sys.ini
@@ -5,4 +5,5 @@
 
 MOD_LOGGED="Logged-in Users"
 MOD_LOGGED_LAYOUT_DEFAULT="Default"
+MOD_LOGGED_LAYOUT_DISABLED="Disabled"
 MOD_LOGGED_XML_DESCRIPTION="This module shows a list of the Logged-in Users."
diff --git a/administrator/language/en-GB/mod_multilangstatus.sys.ini b/administrator/language/en-GB/mod_multilangstatus.sys.ini
@@ -4,4 +4,5 @@
 ; Note : All ini files need to be saved as UTF-8
 
 MOD_MULTILANGSTATUS="Multilingual Status"
+MOD_MULTILANGSTATUS_LAYOUT_DEFAULT="Default"
 MOD_MULTILANGSTATUS_XML_DESCRIPTION="This module shows the status of the multilingual parameters and is intended to be displayed in the 'status' position."
diff --git a/administrator/language/en-GB/mod_post_installation_messages.sys.ini b/administrator/language/en-GB/mod_post_installation_messages.sys.ini
@@ -4,4 +4,5 @@
 ; Note : All ini files need to be saved as UTF-8
 
 MOD_POST_INSTALLATION_MESSAGES="Post Installation Messages"
+MOD_POST_INSTALLATION_MESSAGES_LAYOUT_DEFAULT="Default"
 MOD_POST_INSTALLATION_MESSAGES_XML_DESCRIPTION="This module shows a counter and a link to the latest post installation messages. It is only displayed when there are messages to read."
diff --git a/administrator/language/en-GB/mod_sampledata.sys.ini b/administrator/language/en-GB/mod_sampledata.sys.ini
@@ -4,4 +4,5 @@
 ; Note : All ini files need to be saved as UTF-8
 
 MOD_SAMPLEDATA="Sample Data"
+MOD_SAMPLEDATA_LAYOUT_DEFAULT="Default"
 MOD_SAMPLEDATA_XML_DESCRIPTION="This module lets you install sample data."
diff --git a/administrator/language/en-GB/mod_stats_admin.sys.ini b/administrator/language/en-GB/mod_stats_admin.sys.ini
@@ -4,5 +4,8 @@
 ; Note : All ini files need to be saved as UTF-8
 
 MOD_STATS_ADMIN="Statistics"
-MOD_STATS_LAYOUT_DEFAULT="Default"
+MOD_STATS_ADMIN_LAYOUT_DEFAULT="Default"
 MOD_STATS_XML_DESCRIPTION="The Statistics Module shows information about your server installation together with statistics on the website users and the number of Articles in your database."
+
+; Deprecated, will be removed with 6.0
+MOD_STATS_LAYOUT_DEFAULT="Default"
diff --git a/administrator/language/en-GB/mod_submenu.sys.ini b/administrator/language/en-GB/mod_submenu.sys.ini
@@ -4,4 +4,5 @@
 ; Note : All ini files need to be saved as UTF-8
 
 MOD_SUBMENU="Administrator Dashboard Menu"
+MOD_SUBMENU_LAYOUT_DEFAULT="Default"
 MOD_SUBMENU_XML_DESCRIPTION="This module displays an administrator submenu module."
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss
@@ -22,7 +22,7 @@
 
       &:checked {
         color: var(--template-text-light);
-        background-color: var(--template-bg-dark) !important;
+        background-color: var(--template-contrast) !important;
       }
     }
   }

diff --git a/composer.lock b/composer.lock
diff --git a/installation/sql/mysql/base.sql b/installation/sql/mysql/base.sql
@@ -77,13 +77,13 @@ INSERT INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `titl
 (55, 18, 94, 95, 2, 'com_modules.module.87', 'Sample Data', '{}'),
 (56, 8, 20, 37, 2, 'com_content.workflow.1', 'COM_WORKFLOW_BASIC_WORKFLOW', '{}'),
 (57, 56, 21, 22, 3, 'com_content.stage.1', 'COM_WORKFLOW_BASIC_STAGE', '{}'),
-(58, 56, 23, 24, 3, 'com_content.transition.1', 'Unpublish', '{}'),
-(59, 56, 25, 26, 3, 'com_content.transition.2', 'Publish', '{}'),
-(60, 56, 27, 28, 3, 'com_content.transition.3', 'Trash', '{}'),
-(61, 56, 29, 30, 3, 'com_content.transition.4', 'Archive', '{}'),
-(62, 56, 31, 32, 3, 'com_content.transition.5', 'Feature', '{}'),
-(63, 56, 33, 34, 3, 'com_content.transition.6', 'Unfeature', '{}'),
-(64, 56, 35, 36, 3, 'com_content.transition.7', 'Publish & Feature', '{}'),
+(58, 56, 23, 24, 3, 'com_content.transition.1', 'UNPUBLISH', '{}'),
+(59, 56, 25, 26, 3, 'com_content.transition.2', 'PUBLISH', '{}'),
+(60, 56, 27, 28, 3, 'com_content.transition.3', 'TRASH', '{}'),
+(61, 56, 29, 30, 3, 'com_content.transition.4', 'ARCHIVE', '{}'),
+(62, 56, 31, 32, 3, 'com_content.transition.5', 'FEATURE', '{}'),
+(63, 56, 33, 34, 3, 'com_content.transition.6', 'UNFEATURE', '{}'),
+(64, 56, 35, 36, 3, 'com_content.transition.7', 'PUBLISH_AND_FEATURE', '{}'),
 (65, 1, 143, 144, 1, 'com_privacy', 'com_privacy', '{}'),
 (66, 1, 145, 146, 1, 'com_actionlogs', 'com_actionlogs', '{}'),
 (67, 18, 76, 77, 2, 'com_modules.module.88', 'Latest Actions', '{}'),

diff --git a/installation/sql/postgresql/base.sql b/installation/sql/postgresql/base.sql
@@ -83,13 +83,13 @@ INSERT INTO "#__assets" ("id", "parent_id", "lft", "rgt", "level", "name", "titl
 (55, 18, 94, 95, 2, 'com_modules.module.87', 'Sample Data', '{}'),
 (56, 8, 20, 37, 2, 'com_content.workflow.1', 'COM_WORKFLOW_BASIC_WORKFLOW', '{}'),
 (57, 56, 21, 22, 3, 'com_content.stage.1', 'COM_WORKFLOW_BASIC_STAGE', '{}'),
-(58, 56, 23, 24, 3, 'com_content.transition.1', 'Unpublish', '{}'),
-(59, 56, 25, 26, 3, 'com_content.transition.2', 'Publish', '{}'),
-(60, 56, 27, 28, 3, 'com_content.transition.3', 'Trash', '{}'),
-(61, 56, 29, 30, 3, 'com_content.transition.4', 'Archive', '{}'),
-(62, 56, 31, 32, 3, 'com_content.transition.5', 'Feature', '{}'),
-(63, 56, 33, 34, 3, 'com_content.transition.6', 'Unfeature', '{}'),
-(64, 56, 35, 36, 3, 'com_content.transition.7', 'Publish & Feature', '{}'),
+(58, 56, 23, 24, 3, 'com_content.transition.1', 'UNPUBLISH', '{}'),
+(59, 56, 25, 26, 3, 'com_content.transition.2', 'PUBLISH', '{}'),
+(60, 56, 27, 28, 3, 'com_content.transition.3', 'TRASH', '{}'),
+(61, 56, 29, 30, 3, 'com_content.transition.4', 'ARCHIVE', '{}'),
+(62, 56, 31, 32, 3, 'com_content.transition.5', 'FEATURE', '{}'),
+(63, 56, 33, 34, 3, 'com_content.transition.6', 'UNFEATURE', '{}'),
+(64, 56, 35, 36, 3, 'com_content.transition.7', 'PUBLISH_AND_FEATURE', '{}'),
 (65, 1, 143, 144, 1, 'com_privacy', 'com_privacy', '{}'),
 (66, 1, 145, 146, 1, 'com_actionlogs', 'com_actionlogs', '{}'),
 (67, 18, 76, 77, 2, 'com_modules.module.88', 'Latest Actions', '{}'),

diff --git a/installation/src/Form/Rule/UsernameRule.php b/installation/src/Form/Rule/UsernameRule.php
@@ -15,7 +15,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_BASE') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**

diff --git a/installation/src/Model/ConfigurationModel.php b/installation/src/Model/ConfigurationModel.php
@@ -560,6 +560,18 @@ private function createRootUser($options, $db)
 
         try {
             $db->execute();
+
+            // Synch the sequence if pgsql
+            if (($db->getServerType() === 'postgresql') && (!$result)) {
+                $query = $db->getQuery(true)
+                    ->select('MAX(' . $db->quoteName('id') . ') + 1 AS ' . $db->quoteName('id'))
+                    ->from($db->quoteName('#__users'));
+                $db->setQuery($query);
+                $result = $db->loadResult();
+
+                $db->setQuery('SELECT setval(' . $db->quote('#__users_id_seq') . ', ' .  $result . ', false)')
+                    ->execute();
+            }
         } catch (\RuntimeException $e) {
             Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
 

diff --git a/language/en-GB/mod_articles_news.sys.ini b/language/en-GB/mod_articles_news.sys.ini
@@ -5,4 +5,6 @@
 
 MOD_ARTICLES_NEWS="Articles - Newsflash"
 MOD_ARTICLES_NEWS_LAYOUT_DEFAULT="Default"
+MOD_ARTICLES_NEWS_LAYOUT_HORIZONTAL="Horizontal"
+MOD_ARTICLES_NEWS_LAYOUT_VERTICAL="Vertical"
 MOD_ARTICLES_NEWS_XML_DESCRIPTION="The Newsflash Module will display a fixed number of articles from a specific category."
diff --git a/language/en-GB/mod_whosonline.sys.ini b/language/en-GB/mod_whosonline.sys.ini
@@ -5,4 +5,5 @@
 
 MOD_WHOSONLINE="Who's Online"
 MOD_WHOSONLINE_LAYOUT_DEFAULT="Default"
+MOD_WHOSONLINE_LAYOUT_DISABLED="Disabled"
 MOD_WHOSONLINE_XML_DESCRIPTION="The Who's Online Module displays the number of Anonymous Users (Guests) and Registered Users (users logged-in) that are currently accessing the website."
diff --git a/language/en-GB/tpl_cassiopeia.sys.ini b/language/en-GB/tpl_cassiopeia.sys.ini
@@ -4,7 +4,8 @@
 ; Note : All ini files need to be saved as UTF-8
 
 CASSIOPEIA="Cassiopeia Site template"
-TPL_CASSIOPEIA_MOD_MENU_LAYOUT_COLLAPSE-METISMENU="Collapsible Dropdown"
+TPL_CASSIOPEIA_MOD_CUSTOM_LAYOUT_BANNER="Banner"
+TPL_CASSIOPEIA_MOD_MENU_LAYOUT_COLLAPSE-METISMENU="Collapsible Dropdown"
 TPL_CASSIOPEIA_MOD_MENU_LAYOUT_DROPDOWN-METISMENU="Dropdown"
 TPL_CASSIOPEIA_POSITION_BANNER="Banner"
 TPL_CASSIOPEIA_POSITION_BELOW-TOP="Below Top"

diff --git a/libraries/src/Event/Application/BeforeCompileHeadEvent.php b/libraries/src/Event/Application/BeforeCompileHeadEvent.php
@@ -10,7 +10,6 @@
 namespace Joomla\CMS\Event\Application;
 
 // phpcs:disable PSR1.Files.SideEffects
-
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 

diff --git a/libraries/src/Extension/Service/Provider/MVCFactory.php b/libraries/src/Extension/Service/Provider/MVCFactory.php
@@ -23,7 +23,7 @@
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
-// phpcs:e_JEXECes.SideEffects
+// phpcs:enable PSR1.Files.SideEffects
 
 /**
  * Service provider for the service MVC factory.

diff --git a/libraries/src/Form/Rule/UrlRule.php b/libraries/src/Form/Rule/UrlRule.php
@@ -105,7 +105,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, ?Registr
             return false;
         }
 
-        // For some schemes here must be two slashes.
+        // For some schemes there must be two slashes.
         $scheme = ['http', 'https', 'ftp', 'ftps', 'gopher', 'wais', 'prospero', 'sftp', 'telnet', 'git'];
 
         if (\in_array($urlScheme, $scheme) && substr($value, \strlen($urlScheme), 3) !== '://') {

diff --git a/libraries/src/Table/Ucm.php b/libraries/src/Table/Ucm.php
@@ -9,10 +9,10 @@
 
 namespace Joomla\CMS\Table;
 
-// phpcs:disable PSR1.Files.SideEffects
 use Joomla\Database\DatabaseDriver;
 use Joomla\Event\DispatcherInterface;
 
+// phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects