Merge branch '4.0-dev' into 4.1-dev

Author: wilsonge

.github/CONTRIBUTING.md

@@ -6,19 +6,19 @@ You are welcome to submit a contribution for review and possible inclusion in th
 
 2) Follow the [Joomla! Coding Standards](https://developer.joomla.org/coding-standards.html).
 
-3) When filing an issue or opening a PR, please include a clear title and description. The title should be a short summary of an issue and, if possible, should include a reference to an open issue. For example, `Invalid Query in com_admin (Ref #1234)` would be sufficient. All issues and PRs should include a description with as much detail as possible. 
+3) When filing an issue or opening a PR, please include a clear title and description. The title should be a short summary of an issue and, if possible, should include a reference to an open issue. For example, `Invalid Query in com_admin (Ref #1234)` would be sufficient. All issues and PRs should include a description with as much detail as possible.
 If it is a PR, include what the issue is, what the PR is addressing, testing instructions and environmental information (PHP version, database driver and version, and other data you can retrieve from your site's system information view) in case the issue is specific to certain environments. If additional information is needed, please be prepared to provide it as our community members review your submission.
 
 4) Report security issues to the Joomla! Security Strike Team (JSST) at [email protected] or use the [JSST contact form](https://developer.joomla.org/contact-security-team.html). Please do not use the public tracker for security issues.
 
 Please be patient as not all items will be tested immediately (remember, all bug testing for the Joomla! CMS is done by volunteers) and be receptive to feedback about your code.
 
 #### Branches
-PRs should usually be made to the `staging` branch as this contains the most recent version of the code.
+PRs should usually be made to the `4.0-dev` branch as this contains the most recent version of the code.
 There are other branches available which serve specific purposes.
 
 | Branch | Purpose |
 | ------ | ------- |
-| staging | Current codebase. Branch for the next minor Joomla version. New backward compatible features go into this branch. The 3.9.0 release will include the Privacy Tools Suite features. |
-| 3.10-dev | Branch for the next minor Joomla version. The 3.10.0 release will only include compatibility features for 4.0. Commits to staging will be applied to this branch as well. |
-| 4.0-dev | Branch for the next major Joomla version. New features go into this branch. Commits to staging will be applied to this branch as well. |
+| 3.10-dev | Branch for the Joomla 3.x series. The 3.10 series release will only include compatibility features for 4.x as well as bugfixes and security patches. |
+| 4.0-dev | Branch for the Joomla 4.0 series. Commits to 3.10-dev will be applied to this branch as well. |
+| 4.1-dev | Branch for the next minor Joomla version. New features go into this branch. Commits to 4.0-dev will be applied to this branch as well. |

administrator/components/com_admin/script.php

@@ -4857,20 +4857,6 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 			'/media/system/css/jquery.Jcrop.min.css',
 			'/media/system/css/modal.css',
 			'/media/system/css/system.css',
-			'/media/system/images/modal/bg_e.png',
-			'/media/system/images/modal/bg_n.png',
-			'/media/system/images/modal/bg_ne.png',
-			'/media/system/images/modal/bg_nw.png',
-			'/media/system/images/modal/bg_s.png',
-			'/media/system/images/modal/bg_se.png',
-			'/media/system/images/modal/bg_sw.png',
-			'/media/system/images/modal/bg_w.png',
-			'/media/system/images/modal/closebox.png',
-			'/media/system/images/modal/spinner.gif',
-			'/media/system/images/notice-alert.png',
-			'/media/system/images/notice-download.png',
-			'/media/system/images/notice-info.png',
-			'/media/system/images/notice-note.png',
 			'/media/system/js/associations-edit-uncompressed.js',
 			'/media/system/js/associations-edit.js',
 			'/media/system/js/calendar-setup-uncompressed.js',
@@ -6067,6 +6053,17 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 			'/media/system/js/fields/calendar-locales/zh-CN.min.js.gz',
 			'/media/system/js/fields/calendar-locales/zh-TW.min.js',
 			'/media/system/js/fields/calendar-locales/zh-TW.min.js.gz',
+			// 4.0 from RC 5 to RC 6
+			'/media/templates/cassiopeia/js/mod_menu/menu-metismenu-es5.js',
+			'/media/templates/cassiopeia/js/mod_menu/menu-metismenu-es5.min.js',
+			'/media/templates/cassiopeia/js/mod_menu/menu-metismenu-es5.min.js.gz',
+			'/media/templates/cassiopeia/js/mod_menu/menu-metismenu.js',
+			'/media/templates/cassiopeia/js/mod_menu/menu-metismenu.min.js',
+			'/media/templates/cassiopeia/js/mod_menu/menu-metismenu.min.js.gz',
+			'/templates/cassiopeia/css/vendor/fontawesome-free/fontawesome.css',
+			'/templates/cassiopeia/css/vendor/fontawesome-free/fontawesome.min.css',
+			'/templates/cassiopeia/css/vendor/fontawesome-free/fontawesome.min.css.gz',
+			'/templates/cassiopeia/scss/vendor/fontawesome-free/fontawesome.scss',
 		);
 
 		$folders = array(
@@ -6139,7 +6136,6 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 			'/plugins/content/confirmconsent/fields',
 			'/plugins/captcha/recaptcha/postinstall',
 			'/plugins/authentication/gmail',
-			'/media/system/images/modal',
 			'/media/plg_twofactorauth_totp/js',
 			'/media/plg_twofactorauth_totp',
 			'/media/plg_system_highlight',
@@ -7309,6 +7305,12 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 			'/administrator/components/com_admin/tmpl/profile',
 			'/administrator/components/com_admin/src/View/Profile',
 			'/administrator/components/com_admin/forms',
+			// 4.0 from RC 5 to RC 6
+			'/templates/cassiopeia/scss/vendor/fontawesome-free',
+			'/templates/cassiopeia/css/vendor/fontawesome-free',
+			'/media/templates/cassiopeia/js/mod_menu',
+			'/media/templates/cassiopeia/js',
+			'/media/templates/cassiopeia',
 		);
 
 		$status['files_checked'] = $files;

administrator/components/com_installer/src/Model/UpdatesitesModel.php

@@ -380,7 +380,7 @@ public function rebuild(): void
 					{
 						/**
 						 * Search if the extension exists in the extensions table. Excluding Joomla
-						 * core extensions (id < 10000) and discovered extensions.
+						 * core extensions and discovered but not yet installed extensions.
 						 */
 
 						$name    = (string) $manifest->name;

administrator/components/com_joomlaupdate/src/Model/UpdateModel.php

@@ -1707,6 +1707,6 @@ protected function translateExtensionName(&$item)
 		|| $lang->load($extension, $source);
 
 		// Translate the extension name if possible
-		$item->name = Text::_($item->name);
+		$item->name = strip_tags(Text::_($item->name));
 	}
 }

administrator/components/com_menus/src/Helper/MenusHelper.php

@@ -515,7 +515,7 @@ protected static function installPresetItems($node, $menutype)
 					'menutype'  => $menutype,
 					'type'      => $item->type,
 					'title'     => $item->title,
-					'parent_id' => $item->getParent()->id,
+					'parent_id' => (int) $item->getParent()->id,
 					'client_id' => 1,
 				);
 				$table->load($keys);
@@ -541,7 +541,7 @@ protected static function installPresetItems($node, $menutype)
 					'menutype'  => $menutype,
 					'type'      => $item->type,
 					'link'      => $item->link,
-					'parent_id' => $item->getParent()->id,
+					'parent_id' => (int) $item->getParent()->id,
 					'client_id' => 1,
 				);
 				$table->load($keys);
@@ -577,7 +577,7 @@ protected static function installPresetItems($node, $menutype)
 				'img'          => $item->class,
 				'access'       => $item->access,
 				'component_id' => array_search($item->element, $components) ?: 0,
-				'parent_id'    => $item->getParent()->id,
+				'parent_id'    => (int) $item->getParent()->id,
 				'client_id'    => 1,
 				'published'    => 1,
 				'language'     => '*',

administrator/templates/atum/html/layouts/status.php

@@ -52,7 +52,7 @@
 			echo '<div class="header-item">' . $mod . '</div>';
 		}
 	?>
-	<div class="header-more dropdown d-none" id="header-more-items" >
+	<div class="header-more d-none" id="header-more-items" >
 		<button class="header-more-btn dropdown-toggle" type="button" title="<?php echo Text::_('TPL_ATUM_MORE_ELEMENTS'); ?>" data-bs-toggle="dropdown" aria-expanded="false">
 			<div class="header-item-icon"><span class="icon-ellipsis-h" aria-hidden="true"></span></div>
 			<div class="visually-hidden"><?php echo Text::_('TPL_ATUM_MORE_ELEMENTS'); ?></div>

administrator/templates/atum/scss/pages/_com_joomlaupdate.scss

@@ -0,0 +1,7 @@
+// com_joomlaupdate
+
+.com_joomlaupdate {
+  caption {
+    caption-side: top;
+  }
+}

administrator/templates/atum/scss/template.scss

@@ -61,6 +61,7 @@
 @import "pages/com_config";
 @import "pages/com_content";
 @import "pages/com_cpanel";
+@import "pages/com_joomlaupdate";
 @import "pages/com_modules";
 @import "pages/com_tags";
 @import "pages/com_privacy";

administrator/templates/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss

@@ -51,6 +51,10 @@ joomla-tab {
       border-bottom: 0;
       box-shadow: none;
 
+      &:focus-visible {
+        z-index: 1;
+      }
+
       &[aria-expanded=true],
       &:focus,
       &:hover {

build/build-modules-js/init/minify-vendor.es6.js

@@ -1,5 +1,5 @@
 const { lstat, readFile, writeFile } = require('fs-extra');
-const { sep } = require('path');
+const { sep, basename } = require('path');
 const recursive = require('recursive-readdir');
 const { minify } = require('terser');
 
@@ -18,8 +18,8 @@ const folders = [
 let allFiles = [];
 
 const noMinified = [
-  'media/vendor/accessibility/js/accessibility.min.js',
-  'media/vendor/short-and-sweet/js/short-and-sweet.min.js',
+  'accessibility.min.js',
+  'short-and-sweet.min.js',
 ];
 
 const alreadyMinified = [
@@ -47,7 +47,7 @@ const minifiedExists = async (file) => {
  * @returns {Promise}
  */
 const minifyJS = async (file) => {
-  const needsDotJS = noMinified.includes(file.replace(`${RootPath}${sep}`, ''));
+  const needsDotJS = noMinified.includes(basename(file));
   if (file.endsWith('.min.js') && !needsDotJS) {
     return;
   }