Merge branch '4.0-dev' into j4-cache

.drone.yml

@@ -53,6 +53,13 @@ steps:
   - name: php80-unit
     depends_on: [ phpcs ]
     image: joomlaprojects/docker-images:php8.0
+    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
@@ -87,6 +94,20 @@ steps:
       - php -v
       - ./libraries/vendor/bin/phpunit --testsuite Integration
 
+  - name: php81-integration
+    depends_on: [ npm ]
+    image: joomlaprojects/docker-images:php8.1
+    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
+
   - name: php72-integration-pgsql
     depends_on: [ npm ]
     image: joomlaprojects/docker-images:php7.2
@@ -116,6 +137,20 @@ steps:
       - php -v
       - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
 
+  - name: php81-integration-pgsql
+    depends_on: [ npm ]
+    image: joomlaprojects/docker-images:php8.1
+    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
+
   - name: scss-cs
     depends_on: [ npm ]
     image: node:current-alpine
@@ -128,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: 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: system-tests-mysql8
-    depends_on: [ system-tests-mysql ]
+  - 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: 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: system-tests-postgres
-    depends_on: [ system-tests-mysql8 ]
+  - 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: api-tests
-    depends_on: [ system-tests-postgres ]
+  - 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: 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
@@ -185,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
@@ -251,6 +409,6 @@ steps:
 
 ---
 kind: signature
-hmac: 20fa94a7645c05d5ed14b601ab963bbdbde0d6a804d0ec54ea34b0b78a8b25d9
+hmac: 58ac7c137c4ca8d3f26c6303b041a6aa0efff7f0150b07bded902ce870ab9e5d
 
 ...

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/ActionlogModel.php

@@ -122,6 +122,7 @@ protected function sendNotificationEmails($messages, $username, $context)
 		$query
 			->select($db->quoteName(array('u.email', 'l.extensions')))
 			->from($db->quoteName('#__users', 'u'))
+			->where($db->quoteName('u.block') . ' = 0')
 			->join(
 				'INNER',
 				$db->quoteName('#__action_logs_users', 'l') . ' ON ( ' . $db->quoteName('l.notify') . ' = 1 AND '

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

@@ -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
 	 *

administrator/components/com_admin/script.php

@@ -5948,7 +5948,6 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 			'/administrator/components/com_fields/tmpl/field/modal.php',
 			'/administrator/templates/atum/scss/pages/_com_admin.scss',
 			'/administrator/templates/atum/scss/pages/_com_finder.scss',
-			'/administrator/templates/atum/scss/pages/_com_joomlaupdate.scss',
 			'/libraries/src/Error/JsonApi/InstallLanguageExceptionHandler.php',
 			'/libraries/src/MVC/Controller/Exception/InstallLanguage.php',
 			'/media/com_fields/js/admin-field-edit-modal-es5.js',
@@ -6109,6 +6108,10 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 			'/media/com_joomlaupdate/js/update.min.js.gz',
 			'/templates/cassiopeia/images/system/sort_asc.png',
 			'/templates/cassiopeia/images/system/sort_desc.png',
+			// From 4.0.4 to 4.0.5
+			'/media/vendor/codemirror/lib/#codemirror.js#',
+			// From 4.0.5 to 4.0.6
+			'/media/vendor/mediaelement/css/mejs-controls.png',
 		);
 
 		$folders = array(
@@ -7458,7 +7461,7 @@ public function updateAssets($installer)
 
 		foreach ($newComponents as $component)
 		{
-			/** @var JTableAsset $asset */
+			/** @var \Joomla\CMS\Table\Asset $asset */
 			$asset = Table::getInstance('Asset');
 
 			if ($asset->loadByName($component))

administrator/components/com_admin/sql/updates/mysql/4.0.6-2021-12-23.sql

@@ -0,0 +1 @@
+UPDATE `#__extensions` SET `checked_out` = NULL WHERE `type` = 'package' AND `element` = 'pkg_search' AND `checked_out` = 0;

administrator/components/com_admin/sql/updates/postgresql/4.0.6-2021-12-23.sql

@@ -0,0 +1 @@
+UPDATE "#__extensions" SET "checked_out" = NULL WHERE "type" = 'package' AND "element" = 'pkg_search' AND "checked_out" = 0;

administrator/components/com_associations/src/Field/Modal/AssociationField.php

@@ -41,7 +41,7 @@ class AssociationField extends FormField
 	 */
 	protected function getInput()
 	{
-		// @TODO USE JLayouts here!!!
+		// @todo USE Layouts here!!!
 		// The active item id field.
 		$value = (int) $this->value ?: '';
 

administrator/components/com_associations/src/Model/AssociationModel.php

@@ -26,7 +26,7 @@ class AssociationModel extends ListModel
 	 * @param   array    $data      Data for the form.
 	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
 	 *
-	 * @return  mixed  A \JForm object on success, false on failure
+	 * @return  \Joomla\CMS\Form\Form|boolean  A Form object on success, false on failure
 	 *
 	 * @since  3.7.0
 	 */

administrator/components/com_associations/src/Model/AssociationsModel.php

@@ -155,7 +155,7 @@ protected function getStoreId($id = '')
 	/**
 	 * Build an SQL query to load the list data.
 	 *
-	 * @return  \JDatabaseQuery|boolean
+	 * @return  \Joomla\Database\DatabaseQuery|boolean
 	 *
 	 * @since  3.7.0
 	 */

administrator/components/com_associations/tmpl/associations/modal.php

@@ -168,4 +168,4 @@
 		<input type="hidden" name="forcedLanguage" value="<?php echo $app->input->get('forcedLanguage', '', 'cmd'); ?>">
 		<?php echo HTMLHelper::_('form.token'); ?>
 	</form>
-</div
+</div>