Merge branch '4.2-dev' into emojia11y

joomla · Jun 14, 2022 · 0136b43 · 0136b43
2 parents 7422c13 + 04a0633
commit 0136b43
Show file tree

Hide file tree

Showing 881 changed files with 24,222 additions and 5,333 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -12,7 +12,7 @@ steps:
         path: /tmp/composer-cache
     commands:
       - composer validate --no-check-all --strict
-      - composer install --no-progress
+      - composer install --no-progress --no-suggest
 
   - name: phpcs
     image: joomlaprojects/docker-images:php7.2
@@ -56,13 +56,13 @@ steps:
       - php -v
       - ./libraries/vendor/bin/phpunit --testsuite Unit
 
-#  - name: php81-unit
-#    depends_on: [ phpcs ]
-#    image: joomlaprojects/docker-images:php8.1
-#    failure: ignore
-#    commands:
-#      - php -v
-#      - ./libraries/vendor/bin/phpunit --testsuite Unit
+  - name: php81-unit
+    depends_on: [ phpcs ]
+    image: joomlaprojects/docker-images:php8.1
+    failure: ignore
+    commands:
+      - php -v
+      - ./libraries/vendor/bin/phpunit --testsuite Unit
 
   - name: php72-integration
     depends_on: [ npm ]
@@ -162,9 +162,17 @@ steps:
     commands:
       - npm run lint:js
 
+  - name: prepare_codeception_tests
+    depends_on:
+      - npm
+    image: joomlaprojects/docker-images:systemtests
+    commands:
+      - sed -i 's/tests\\/Codeception\\/_output/\\/drone\\/src\\/tests\\/Codeception\\/_output/' codeception.yml
+      - php libraries/vendor/bin/codecept build
+
   - name: phpmin-api-mysql
     depends_on:
-      - javascript-cs
+      - prepare_codeception_tests
     image: joomlaprojects/docker-images:systemtests
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
@@ -173,17 +181,16 @@ steps:
 
   - name: phpmax-api-mysql
     depends_on:
-      - phpmin-api-mysql
+      - prepare_codeception_tests
     image: joomlaprojects/docker-images:systemtests8.1
-    failure: ignore
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
-      - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysql
+      - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysqlphpmax
 
 #  - name: phpnext-api-mysql
 #    depends_on:
-#      - phpmin-api-mysql
+#      - phpmax-api-mysql
 #    image: joomlaprojects/docker-images:systemtests8.2
 #    failure: ignore
 #    environment:
@@ -193,15 +200,22 @@ steps:
 
   - name: phpmin-api-postgres
     depends_on:
- #     - phpnext-api-mysql
-      - phpmin-api-mysql
+      - prepare_codeception_tests
     image: joomlaprojects/docker-images:systemtests
-    failure: ignore
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgres
 
+  - name: phpmax-api-postgres
+    depends_on:
+      - prepare_codeception_tests
+    image: joomlaprojects/docker-images:systemtests8.1
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+    commands:
+      - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgresphpmax
+
 #  - name: phpnext-api-postgres
 #    depends_on:
 #      - phpmin-api-postgres
@@ -212,106 +226,95 @@ steps:
 #    commands:
 #      - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgresphpnext
 
-  - name: phpmax-api-postgres
-    depends_on:
-#      - phpnext-api-postgres
-      - phpmin-api-postgres
-    image: joomlaprojects/docker-images:systemtests8.1
-    failure: ignore
-    environment:
-      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-    commands:
-      - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgres
-
   - name: phpmin-system-mysql
     depends_on:
-      - javascript-cs
+      - phpmax-api-mysql
       - phpmax-api-postgres
     image: joomlaprojects/docker-images:systemtests
-    failure: ignore
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql
 
-#  - name: phpnext-system-mysql
-#    depends_on:
-#      - phpmin-system-mysql
-#    image: joomlaprojects/docker-images:systemtests8.2
-#    failure: ignore
-#    environment:
-#      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-#    commands:
-#      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysqlphpnext
-
   - name: phpmax-system-mysql
     depends_on:
-#      - phpnext-system-mysql
-      - phpmin-system-mysql
+      - phpmax-api-mysql
+      - phpmax-api-postgres
     image: joomlaprojects/docker-images:systemtests8.1
-    failure: ignore
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysqlphpmax
 
-#  - name: phpnext-system-mysql8
+#  - name: phpnext-system-mysql
 #    depends_on:
 #      - phpmax-system-mysql
 #    image: joomlaprojects/docker-images:systemtests8.2
 #    failure: ignore
 #    environment:
 #      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
 #    commands:
-#      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8phpnext
+#      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysqlphpnext
 
-  - name: phpmax-system-mysql8
+  - name: phpmin-system-postgres
     depends_on:
-#      - phpnext-system-mysql
-      - phpmax-system-mysql
+      - phpmax-api-mysql
+      - phpmax-api-postgres
+    image: joomlaprojects/docker-images:systemtests
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+    commands:
+      - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgres
+
+  - name: phpmax-system-postgres
+    depends_on:
+      - phpmax-api-mysql
+      - phpmax-api-postgres
     image: joomlaprojects/docker-images:systemtests8.1
-    failure: ignore
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
-      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8phpmax
+      - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgresphpmax
 
 #  - name: phpnext-system-postgres
 #    depends_on:
-#      - phpmax-system-mysql8
+#      - phpmax-system-postgres
 #    image: joomlaprojects/docker-images:systemtests8.2
 #    failure: ignore
 #    environment:
 #      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
 #    commands:
 #      - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgresphpnext
 
-  - name: phpmax-system-postgres
-    depends_on:
-#      - phpnext-system-mysql8
-      - phpmax-system-mysql8
-    image: joomlaprojects/docker-images:systemtests8.1
-    failure: ignore
-    environment:
-      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-    commands:
-      - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgresphpmax
-
   - name: phpmin-system-mysql8
-    depends_on: [ phpmax-system-postgres ]
+    depends_on:
+      - phpmax-system-mysql
+      - phpmax-system-postgres
     image: joomlaprojects/docker-images:systemtests
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8
 
-  - name: phpmin-system-postgres
-    depends_on: [ phpmin-system-mysql8 ]
-    image: joomlaprojects/docker-images:systemtests
+  - name: phpmax-system-mysql8
+    depends_on:
+      - phpmax-system-mysql
+      - phpmax-system-postgres
+    image: joomlaprojects/docker-images:systemtests8.1
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
-      - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgres
+      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8phpmax
+
+#  - name: phpnext-system-mysql8
+#    depends_on:
+#      - phpmax-system-mysql8
+#    image: joomlaprojects/docker-images:systemtests8.2
+#    failure: ignore
+#    environment:
+#      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+#    commands:
+#      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8phpnext
 
   - name: artifacts-system-tests
     image: cschlosser/drone-ftps
@@ -349,9 +352,6 @@ steps:
       status:
         - failure
 
-branches:
-  exclude: [ l10n_* ]
-
 volumes:
   - name: composer-cache
     host:
@@ -414,7 +414,7 @@ steps:
         path: /reference
     when:
       branch:
-        - 4.1-dev
+        - 4.2-dev
 
 ---
 kind: pipeline
@@ -478,6 +478,6 @@ trigger:
 
 ---
 kind: signature
-hmac: e803744a300d47d73d1a7f693bcd0a72e7d9e2c7830bd246baf8dff482913949
+hmac: 234ae9e7e2fbfa114ba754c68056dec518c76a93de2f5b098f569e355b50cc1b
 
 ...
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -38,12 +38,6 @@ phpunit-pgsql.xml.dist  @rdeutz @hackwar
 # HttpHeaders Plugin
 plugins/system/httpheaders/*  @zero-24
 
-# Web Authentication (WebAuthn)
-plugins/system/webauthn/*   @nikosdion
-media/plg_system_webauthn/*   @nikosdion
-administrator/language/en-GB/plg_system_webauthn.ini   @nikosdion
-administrator/language/en-GB/plg_system_webauthn.sys.ini   @nikosdion
-
 # Workflow
 administrator/components/com_workflow/*	@bembelimen @hleithner
 administrator/language/en-GB/com_workflow.ini	@bembelimen @hleithner
@@ -72,3 +66,6 @@ installation/tmpl/* @chmst
 
 # Translation GitHub Actions
 .github/workflows/create-translation-pull-request-v4.yml @hleithner
+
+# Libraries
+libraries/src/* @laoneo
diff --git a/README.md b/README.md
@@ -11,8 +11,8 @@ Overview
 ---------------------
 * This is the source of Joomla! 4.x.
 * Joomla's [Official website](https://www.joomla.org).
-* Joomla! 4.1 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_4.1_version_history).
-* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/4.1-dev).
+* Joomla! 4.2 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_4.2_version_history).
+* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/4.2-dev).
 
 What is Joomla?
 ---------------------
@@ -45,9 +45,9 @@ git clone https://github.com/joomla/joomla-cms.git
 ```bash
 cd joomla-cms
 ```
-- Go to the 4.1-dev branch:
+- Go to the 4.2-dev branch:
 ```bash
-git checkout 4.1-dev
+git checkout 4.2-dev
 ```
 - Install all the needed composer packages:
 ```bash

diff --git a/README.txt b/README.txt
@@ -3,8 +3,8 @@ Joomla! CMS™
 1- Overview
 	* This is a Joomla! 4.x installation/upgrade package.
 	* Joomla! Official site: https://www.joomla.org
-	* Joomla! 4.1 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_4.1_version_history
-	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/4.1-dev
+	* Joomla! 4.2 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_4.2_version_history
+	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/4.2-dev
 
 2- What is Joomla?
 	* Joomla! is a Content Management System (CMS) which enables you to build websites and powerful online applications.

diff --git a/administrator/components/com_actionlogs/actionlogs.xml b/administrator/components/com_actionlogs/actionlogs.xml
@@ -2,7 +2,7 @@
 <extension type="component" method="upgrade">
 	<name>com_actionlogs</name>
 	<author>Joomla! Project</author>
-	<creationDate>May 2018</creationDate>
+	<creationDate>2018-05</creationDate>
 	<copyright>(C) 2018 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/administrator/components/com_actionlogs/config.xml b/administrator/components/com_actionlogs/config.xml
@@ -29,6 +29,7 @@
 			type="logtype"
 			label="COM_ACTIONLOGS_LOG_EXTENSIONS_LABEL"
 			multiple="true"
+			layout="joomla.form.field.list-fancy-select"
 			default="com_banners,com_cache,com_categories,com_checkin,com_config,com_contact,com_content,com_installer,com_media,com_menus,com_messages,com_modules,com_newsfeeds,com_plugins,com_redirect,com_scheduler,com_tags,com_templates,com_users"
 		/>
 		<field

diff --git a/administrator/components/com_actionlogs/src/Field/ExtensionField.php b/administrator/components/com_actionlogs/src/Field/ExtensionField.php
@@ -11,7 +11,6 @@
 
 \defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
@@ -41,7 +40,7 @@ class ExtensionField extends ListField
 	 */
 	public function getOptions()
 	{
-		$db    = Factory::getDbo();
+		$db    = $this->getDatabase();
 		$query = $db->getQuery(true)
 			->select('DISTINCT ' . $db->quoteName('extension'))
 			->from($db->quoteName('#__action_logs'))

diff --git a/administrator/components/com_actionlogs/src/Field/LogcreatorField.php b/administrator/components/com_actionlogs/src/Field/LogcreatorField.php
@@ -11,7 +11,6 @@
 
 \defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
 
 /**
@@ -53,7 +52,7 @@ protected function getOptions()
 		{
 			static::$options[$hash] = parent::getOptions();
 
-			$db = Factory::getDbo();
+			$db = $this->getDatabase();
 
 			// Construct the query
 			$query = $db->getQuery(true)