Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev

bembelimen · bembelimen · commit bc896d2fe572 · 2021-08-15T14:57:25.000+02:00
# Conflicts:
#	libraries/src/Version.php
diff --git a/README.md b/README.md
@@ -70,6 +70,7 @@ Do you want to improve Joomla?
 * Get Involved: Joomla! is community developed software. [Join the community](https://volunteers.joomla.org).
 * Documentation for [Developers](https://docs.joomla.org/Special:MyLanguage/Portal:Developers).
 * Documentation for [Web designers](https://docs.joomla.org/Special:MyLanguage/Web_designers).
+* Provide a translation for Joomla: [Joomla Crowdin Project](https://joomla.crowdin.com/cms)
 
 Copyright
 ---------------------
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -6064,6 +6064,24 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 			'/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',
+			// 4.0 from RC 6 to 4.0.0 (stable)
+			'/libraries/vendor/algo26-matthias/idna-convert/tests/integration/ToIdnTest.php',
+			'/libraries/vendor/algo26-matthias/idna-convert/tests/integration/ToUnicodeTest.php',
+			'/libraries/vendor/algo26-matthias/idna-convert/tests/unit/.gitkeep',
+			'/libraries/vendor/algo26-matthias/idna-convert/tests/unit/namePrepTest.php',
+			'/libraries/vendor/doctrine/inflector/docs/en/index.rst',
+			'/libraries/vendor/jakeasmith/http_build_url/tests/HttpBuildUrlTest.php',
+			'/libraries/vendor/jakeasmith/http_build_url/tests/bootstrap.php',
+			'/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/AcceptLanguageTest.php',
+			'/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/AcceptTest.php',
+			'/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/BaseAcceptTest.php',
+			'/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/CharsetNegotiatorTest.php',
+			'/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/EncodingNegotiatorTest.php',
+			'/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/LanguageNegotiatorTest.php',
+			'/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/MatchTest.php',
+			'/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/NegotiatorTest.php',
+			'/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/TestCase.php',
+			'/libraries/vendor/willdurand/negotiation/tests/bootstrap.php',
 		);
 
 		$folders = array(
@@ -7311,6 +7329,16 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 			'/media/templates/cassiopeia/js/mod_menu',
 			'/media/templates/cassiopeia/js',
 			'/media/templates/cassiopeia',
+			// 4.0 from RC 6 to 4.0.0 (stable)
+			'/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests',
+			'/libraries/vendor/willdurand/negotiation/tests/Negotiation',
+			'/libraries/vendor/willdurand/negotiation/tests',
+			'/libraries/vendor/jakeasmith/http_build_url/tests',
+			'/libraries/vendor/doctrine/inflector/docs/en',
+			'/libraries/vendor/doctrine/inflector/docs',
+			'/libraries/vendor/algo26-matthias/idna-convert/tests/unit',
+			'/libraries/vendor/algo26-matthias/idna-convert/tests/integration',
+			'/libraries/vendor/algo26-matthias/idna-convert/tests',
 		);
 
 		$status['files_checked'] = $files;
diff --git a/administrator/components/com_joomlaupdate/src/Controller/DisplayController.php b/administrator/components/com_joomlaupdate/src/Controller/DisplayController.php
@@ -14,6 +14,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\Response\JsonResponse;
+use Joomla\CMS\Router\Route;
 
 /**
  * Joomla! Update Controller
diff --git a/administrator/components/com_mails/config.xml b/administrator/components/com_mails/config.xml
@@ -62,7 +62,7 @@
 			label="JCONFIG_PERMISSIONS_LABEL"
 			filter="rules"
 			validate="rules"
-			component="com_messages"
+			component="com_mails"
 			section="component"
 		/>
 	</fieldset>
diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>4.0.0</version>
-	<creationDate>July 2021</creationDate>
+	<creationDate>August 2021</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="administrator">
 	<name>English (en-GB)</name>
 	<version>4.0.0</version>
-	<creationDate>July 2021</creationDate>
+	<creationDate>August 2021</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
@@ -6,8 +6,8 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>4.0.0-rc6-dev</version>
-	<creationDate>July 2021</creationDate>
+	<version>4.0.0-rc7-dev</version>
+	<creationDate>August 2021</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>
diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
 	<version>4.0.0.1</version>
-	<creationDate>July 2021</creationDate>
+	<creationDate>August 2021</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="api">
 	<name>English (en-GB)</name>
 	<version>4.0.0</version>
-	<creationDate>July 2021</creationDate>
+	<creationDate>August 2021</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/build/build.php b/build/build.php
@@ -110,16 +110,25 @@ function clean_checkout(string $dir)
 	system('find libraries/vendor -name _config.yml | xargs rm -rf -');
 	system('rm -rf libraries/vendor/bin');
 
+	// aldo26-matthias/idna-convert
+	system('rm -rf libraries/vendor/algo26-matthias/idna-convert/tests');
+
 	// defuse/php-encryption
 	system('rm -rf libraries/vendor/defuse/php-encryption/docs');
 
+	// doctrine/inflector
+	system('rm -rf libraries/vendor/doctrine/inflector/docs');
+
 	// fig/link-util
 	system('rm -rf libraries/vendor/fig/link-util/test');
 
 	// google/recaptcha
 	system('rm -rf libraries/vendor/google/recaptcha/examples');
 	system('rm -rf libraries/vendor/google/recaptcha/tests');
 
+	// jakeasmith/http_build_url
+	system ('rm -rf libraries/vendor/jakeasmith/http_build_url/tests');
+
 	// joomla/*
 	system('rm -rf libraries/vendor/joomla/*/docs');
 	system('rm -rf libraries/vendor/joomla/*/tests');
@@ -149,6 +158,9 @@ function clean_checkout(string $dir)
 	// wamania/php-stemmer
 	system('rm -rf libraries/vendor/wamania/php-stemmer/test');
 
+	// willdurand/negotiation
+	system('rm -rf libraries/vendor/willdurand/negotiation/tests');
+
 	echo "Cleanup complete.\n";
 
 	chdir($cwd);
diff --git a/build/bump.php b/build/bump.php
@@ -47,7 +47,7 @@ function usage($command)
 	'/language/en-GB/install.xml',
 	'/administrator/language/en-GB/langmetadata.xml',
 	'/administrator/language/en-GB/install.xml',
-	'/installation/language/en-GB/en-GB.xml',
+	'/installation/language/en-GB/langmetadata.xml',
 	'/api/language/en-GB/langmetadata.xml'
 );
 
diff --git a/build/media_source/com_categories/joomla.asset.json b/build/media_source/com_categories/joomla.asset.json
@@ -5,6 +5,14 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
+    {
+      "name": "com_categories.shared-categories-accordion",
+      "type": "preset",
+      "dependencies": [
+        "com_categories.shared-categories-accordion#style",
+        "com_categories.shared-categories-accordion#script"
+      ]
+    },
     {
       "name": "com_categories.shared-categories-accordion.es5",
       "type": "script",
diff --git a/build/media_source/com_categories/js/shared-categories-accordion.es6.js b/build/media_source/com_categories/js/shared-categories-accordion.es6.js
@@ -38,7 +38,8 @@ const handleCategoryToggleButtonClick = ({ currentTarget }) => {
     ),
   );
 
-  const target = button.nextElementSibling;
+  const { categoryId } = button.dataset;
+  const target = document.getElementById(`category-${categoryId}`);
   target.toggleAttribute('hidden');
 };
 
diff --git a/components/com_content/tmpl/categories/default.php b/components/com_content/tmpl/categories/default.php
@@ -19,8 +19,7 @@
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->document->getWebAssetManager();
 $wa->getRegistry()->addExtensionRegistryFile('com_categories');
-$wa->useStyle('com_categories.shared-categories-accordion');
-$wa->useScript('com_categories.shared-categories-accordion');
+$wa->usePreset('com_categories.shared-categories-accordion');
 
 ?>
 <div class="com-content-categories categories-list">
diff --git a/components/com_content/tmpl/categories/default_items.php b/components/com_content/tmpl/categories/default_items.php
@@ -34,6 +34,7 @@
 					<button
 						type="button"
 						id="category-btn-<?php echo $item->id; ?>"
+						data-category-id="<?php echo $item->id; ?>"
 						class="btn btn-secondary btn-sm"
 						aria-expanded="false"
 						aria-label="<?php echo Text::_('JGLOBAL_EXPAND_CATEGORIES'); ?>"
diff --git a/crowdin.yml b/crowdin.yml
diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>English (United Kingdom)</name>
 	<version>4.0.0</version>
-	<creationDate>October 2019</creationDate>
+	<creationDate>August 2021</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
diff --git a/installation/language/en-US/langmetadata.xml b/installation/language/en-US/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>English (United States)</name>
 	<version>4.0.0</version>
-	<creationDate>October 2019</creationDate>
+	<creationDate>August 2021</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2008 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>4.0.0</version>
-	<creationDate>July 2021</creationDate>
+	<creationDate>August 2021</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="site">
 	<name>English (en-GB)</name>
 	<version>4.0.0</version>
-	<creationDate>July 2021</creationDate>
+	<creationDate>August 2021</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/libraries/src/Factory.php b/libraries/src/Factory.php
@@ -418,8 +418,7 @@ public static function getDbo()
 		@trigger_error(
 			sprintf(
 				'%1$s() is deprecated. Load the database from the dependency injection container.',
-				__METHOD__,
-				__CLASS__
+				__METHOD__
 			),
 			E_USER_DEPRECATED
 		);
diff --git a/libraries/src/Helper/MediaHelper.php b/libraries/src/Helper/MediaHelper.php
@@ -31,7 +31,7 @@ class MediaHelper
 	 * Joomla\CMS\Filter\InputFilter
 	 *
 	 * @var    string[]
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	public const EXECUTABLES = array(
 		'js', 'exe', 'dll', 'go', 'ade', 'adp', 'bat', 'chm', 'cmd', 'com', 'cpl', 'hta',
@@ -165,7 +165,7 @@ private function checkMimeType($mime, $component = 'com_media'): bool
 	 *
 	 * @return  boolean  true if it passes the checks else false
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public static function checkFileExtension($extension, $component = 'com_media', $allowedExecutables = array()): bool
 	{
diff --git a/libraries/src/Version.php b/libraries/src/Version.php
@@ -85,15 +85,15 @@ final class Version
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELDATE = '27-July-2021';
+	const RELDATE = '10-August-2021';
 
 	/**
 	 * Release time.
 	 *
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELTIME = '22:48';
+	const RELTIME = '23:02';
 
 	/**
 	 * Release timezone.
diff --git a/plugins/installer/webinstaller/webinstaller.xml b/plugins/installer/webinstaller/webinstaller.xml
@@ -7,9 +7,8 @@
 	<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<version>1.1.1</version>
+	<version>4.0.0</version>
 	<description>PLG_INSTALLER_WEBINSTALLER_XML_DESCRIPTION</description>
-
 	<files>
 		<filename plugin="webinstaller">webinstaller.php</filename>
 	</files>
