Merge branch '4.1-dev' into j4/mce/paste

.drone.yml

@@ -53,7 +53,6 @@ steps:
   - name: php80-unit
     depends_on: [ phpcs ]
     image: joomlaprojects/docker-images:php8.0
-    failure: ignore
     commands:
       - php -v
       - ./libraries/vendor/bin/phpunit --testsuite Unit
@@ -98,7 +97,13 @@ steps:
   - name: php81-integration
     depends_on: [ npm ]
     image: joomlaprojects/docker-images:php8.1
-    failure: ignore
+    commands:
+      - php -v
+      - ./libraries/vendor/bin/phpunit --testsuite Integration
+
+  - name: php82-integration
+    depends_on: [ npm ]
+    image: joomlaprojects/docker-images:php8.2
     commands:
       - php -v
       - ./libraries/vendor/bin/phpunit --testsuite Integration
@@ -135,7 +140,13 @@ steps:
   - name: php81-integration-pgsql
     depends_on: [ npm ]
     image: joomlaprojects/docker-images:php8.1
-    failure: ignore
+    commands:
+      - php -v
+      - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
+
+  - name: php82-integration-pgsql
+    depends_on: [ npm ]
+    image: joomlaprojects/docker-images:php8.2
     commands:
       - php -v
       - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
@@ -152,41 +163,164 @@ steps:
     commands:
       - npm run lint:js
 
-  - name: system-tests-mysql
-    depends_on: [ javascript-cs ]
+  - name: phpmin-api-mysql
+    depends_on:
+      - javascript-cs
     image: joomlaprojects/docker-images:systemtests
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
-      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql
+      - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysql
+
+  - name: phpmax-api-mysql
+    depends_on:
+      - phpmin-api-mysql
+    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
 
-  - name: system-tests-mysql8
-    depends_on: [ system-tests-mysql ]
+  - name: phpnext-api-mysql
+    depends_on:
+      - phpmin-api-mysql
+    image: joomlaprojects/docker-images:systemtests8.2
+    failure: ignore
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+    commands:
+      - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysqlphpnext
+
+  - name: phpmin-api-postgres
+    depends_on:
+      - phpnext-api-mysql
     image: joomlaprojects/docker-images:systemtests
+    failure: ignore
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
-      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8
+      - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgres
 
-  - name: system-tests-postgres
-    depends_on: [ system-tests-mysql8 ]
+  - name: phpnext-api-postgres
+    depends_on:
+      - phpmin-api-postgres
+    image: joomlaprojects/docker-images:systemtests8.2
+    failure: ignore
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+    commands:
+      - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgresphpnext
+
+  - name: phpmax-api-postgres
+    depends_on:
+      - phpnext-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-postgres
     image: joomlaprojects/docker-images:systemtests
+    failure: ignore
     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)" 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 ]
+    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
+    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
+
+  - name: phpmax-system-mysql8
+    depends_on: [ phpnext-system-mysql ]
+    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
+
+  - name: phpnext-system-postgres
+    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)" postgresphpnext
 
-  - name: api-tests
-    depends_on: [ system-tests-postgres ]
+  - name: phpmax-system-postgres
+    depends_on: [ phpnext-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 ]
     image: joomlaprojects/docker-images:systemtests
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
-      - bash tests/Codeception/drone-api-run.sh "$(pwd)"
+      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8
+
+  - name: phpmin-system-postgres
+    depends_on: [ phpmin-system-mysql8 ]
+    image: joomlaprojects/docker-images:systemtests
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+    commands:
+      - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgres
 
   - name: artifacts-system-tests
     image: cschlosser/drone-ftps
-    depends_on: [ api-tests ]
+    depends_on:
+      - phpnext-system-mysql
+      - phpnext-system-mysql8
+      - phpnext-system-postgres
+      - phpmax-system-mysql
+      - phpmax-system-mysql8
+      - phpmax-system-postgres
+      - phpmin-system-mysql
+      - phpmin-system-mysql8
+      - phpmin-system-postgres
+      - phpnext-api-mysql
+      - phpnext-api-postgres
+      - phpmax-api-mysql
+      - phpmax-api-postgres
+      - phpmin-api-mysql
+      - phpmin-api-postgres
     environment:
       FTP_USERNAME:
         from_secret: ftpusername
@@ -209,9 +343,9 @@ branches:
   exclude: [ l10n_* ]
 
 volumes:
-- name: composer-cache
-  host:
-    path: /tmp/composer-cache
+  - name: composer-cache
+    host:
+      path: /tmp/composer-cache
 
 services:
   - name: mysql
@@ -270,11 +404,11 @@ steps:
         path: /reference
     when:
       branch:
-        - 4.0-dev
+        - 4.1-dev
 
 
 ---
 kind: signature
-hmac: 68e2cbd3dfedad9eef3ac5c5557301b69d7fb869d0a6a71bd5a9346b802d4b7e
+hmac: e93522732dd8607448fa7705982c42c06f9ebf9762023ed1bb2207ee975fee42
 
 ...

.github/CODEOWNERS

@@ -66,3 +66,14 @@ libraries/src/MVC/Model/Workflow*	@bembelimen @hleithner
 libraries/src/Workflow/*	@bembelimen @hleithner
 build/media_source/com_workflow/*	@bembelimen @hleithner
 plugins/workflow/*	@bembelimen @hleithner
+
+# Joomla! Accessibility Team
+administrator/*/components/*/tmpl/* @chmst
+administrator/*/modules/*/tmpl/* @chmst
+administrator/templates/atum/* @chmst
+components/*/tmpl/* @chmst
+modules/*/tmpl/* @chmst
+plugins/*/tmpl/* @chmst
+templates/cassiopeia/* @chmst
+layouts/* @chmst
+installation/tmpl/* @chmst

README.md

@@ -11,7 +11,7 @@ Overview
 ---------------------
 * This is the source of Joomla! 4.x.
 * Joomla's [Official website](https://www.joomla.org).
-* Joomla! 4.0 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_4.0_version_history).
+* 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.0-dev).
 
 What is Joomla?

README.txt

@@ -3,7 +3,7 @@ Joomla! CMS™
 1- Overview
 	* This is a Joomla! 4.x installation/upgrade package.
 	* Joomla! Official site: https://www.joomla.org
-	* Joomla! 4.0 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_4.0_version_history
+	* 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.0-dev
 
 2- What is Joomla?

administrator/components/com_actionlogs/config.xml

@@ -28,7 +28,7 @@
 			type="logtype"
 			label="COM_ACTIONLOGS_LOG_EXTENSIONS_LABEL"
 			multiple="true"
-			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_tags,com_templates,com_users"
+			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
 			name="loggable_api"
@@ -57,5 +57,16 @@
 			<option value="PUT">COM_ACTIONLOGS_FIELD_VALUE_PUT</option>
 			<option value="PATCH">COM_ACTIONLOGS_FIELD_VALUE_PATCH</option>
 		</field>
+		<field
+			name="date_relative"
+			type="radio"
+			label="COM_ACTIONLOGS_DATE_RELATIVE_LABEL"
+			layout="joomla.form.field.radio.switcher"
+			default="1"
+			filter="integer"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
 	</fieldset>
 </config>

administrator/components/com_actionlogs/src/Controller/ActionlogsController.php

@@ -40,7 +40,7 @@ class ActionlogsController extends AdminController
 	 *                                         Recognized key values include 'name', 'default_task', 'model_path', and
 	 *                                         'view_path' (this list is not meant to be comprehensive).
 	 * @param   MVCFactoryInterface  $factory  The factory.
-	 * @param   CMSApplication       $app      The JApplication for the dispatcher
+	 * @param   CMSApplication       $app      The Application for the dispatcher
 	 * @param   Input                $input    Input
 	 *
 	 * @since   3.9.0

administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php

@@ -16,6 +16,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Router\Route;
 use Joomla\String\StringHelper;
 
@@ -30,6 +31,7 @@ class ActionlogsHelper
 	 * Array of characters starting a formula
 	 *
 	 * @var    array
+	 *
 	 * @since  3.9.7
 	 */
 	private static $characters = array('=', '+', '-', '@');
@@ -42,6 +44,7 @@ class ActionlogsHelper
 	 * @return  Generator
 	 *
 	 * @since   3.9.0
+	 *
 	 * @throws  \InvalidArgumentException
 	 */
 	public static function getCsvData($data): Generator
@@ -173,8 +176,8 @@ public static function getLogContentTypeParams($context)
 	/**
 	 * Get human readable log message for a User Action Log
 	 *
-	 * @param   stdClass  $log            A User Action log message record
-	 * @param   boolean   $generateLinks  Flag to disable link generation when creating a message
+	 * @param   \stdClass  $log            A User Action log message record
+	 * @param   boolean    $generateLinks  Flag to disable link generation when creating a message
 	 *
 	 * @return  string
 	 *
@@ -233,11 +236,11 @@ public static function getHumanReadableLogMessage($log, $generateLinks = true)
 	/**
 	 * Get link to an item of given content type
 	 *
-	 * @param   string   $component
-	 * @param   string   $contentType
-	 * @param   integer  $id
-	 * @param   string   $urlVar
-	 * @param   JObject  $object
+	 * @param   string     $component
+	 * @param   string     $contentType
+	 * @param   integer    $id
+	 * @param   string     $urlVar
+	 * @param   CMSObject  $object
 	 *
 	 * @return  string  Link to the content item
 	 *

administrator/components/com_actionlogs/src/Model/ActionlogsModel.php

@@ -166,8 +166,8 @@ protected function getListQuery()
 			else
 			{
 				$search = '%' . $search . '%';
-				$query->where($db->quoteName('u.username') . ' LIKE :username')
-					->bind(':username', $search);
+				$query->where($db->quoteName('a.message') . ' LIKE :message')
+					->bind(':message', $search);
 			}
 		}
 
@@ -269,7 +269,7 @@ public function getLogsForItem($extension, $itemId)
 	}
 
 	/**
-	 * Get logs data into JTable object
+	 * Get logs data into Table object
 	 *
 	 * @param   integer[]|null  $pks  An optional array of log record IDs to load
 	 *