Merge branch '4.3-dev' into multi-select

README.md

@@ -5,7 +5,7 @@ Build Status
 ---------------------
 | Drone-CI      | AppVeyor      | PHP           |  Node         | npm           |
 | ------------- | ------------- | ------------- | ------------- | ------------- |
-| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=4.2-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/4.2-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V7.2.5-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V16.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v8.6.0-green)](https://nodejs.org/en/) |
+| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=4.3-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/4.3-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V7.2.5-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V16.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v8.6.0-green)](https://nodejs.org/en/) |
 
 Overview
 ---------------------
@@ -45,9 +45,9 @@ git clone https://github.com/joomla/joomla-cms.git
 ```bash
 cd joomla-cms
 ```
-- Go to the 4.2-dev branch:
+- Go to the 4.3-dev branch:
 ```bash
-git checkout 4.2-dev
+git checkout 4.3-dev
 ```
 - Install all the needed composer packages:
 ```bash

administrator/components/com_admin/postinstall/htaccesssetce.php

@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file contains post-installation message handling for notifying users of a change
+ * in the default .htaccess file regarding setting the Content-Encoding header.
+ */
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Notifies users of a change in the default .htaccess file regarding setting the Content-Encoding header
+ *
+ * This check returns true regardless of condition.
+ *
+ * @return  boolean
+ *
+ * @since   4.2.9
+ */
+function admin_postinstall_htaccesssetce_condition()
+{
+    return true;
+}

administrator/components/com_admin/script.php

@@ -6543,6 +6543,11 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/plugins/finder/tags/tags.php',
             // From 4.3.0-beta3 to 4.3.0-beta4
             '/layouts/joomla/content/categories_default_items.php',
+            // From 4.3.0-beta4 to 4.3.0-rc1
+            '/administrator/components/com_guidedtours/src/Helper/GuidedtoursHelper.php',
+            '/libraries/vendor/voku/portable-ascii/build/docs/base.md',
+            '/libraries/vendor/voku/portable-ascii/build/generate_docs.php',
+            '/libraries/vendor/voku/portable-ascii/build/generate_max_key_length.php',
         ];
 
         $folders = [
@@ -7923,6 +7928,10 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/components/com_contact/layouts',
             // From 4.2.x to 4.3.0-alpha1
             '/libraries/vendor/paragonie/sodium_compat/dist',
+            // From 4.3.0-beta4 to 4.3.0-rc1
+            '/libraries/vendor/voku/portable-ascii/build/docs',
+            '/libraries/vendor/voku/portable-ascii/build',
+            '/administrator/components/com_guidedtours/src/Helper',
         ];
 
         $status['files_checked']   = $files;

administrator/components/com_admin/sql/updates/mysql/4.2.9-2023-03-07.sql

@@ -0,0 +1,5 @@
+--
+-- Add post-installation message about setting the Content-Encoding header in .htaccess
+--
+INSERT IGNORE INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`)
+SELECT `extension_id`, 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_SETCE_TITLE', 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_SETCE_DESCRIPTION', '', 'com_admin', 1, 'message', '', '', 'admin://components/com_admin/postinstall/htaccesssetce.php', 'admin_postinstall_htaccesssetce_condition', '4.2.9', 1 FROM `#__extensions` WHERE `name` = 'files_joomla';

administrator/components/com_admin/sql/updates/mysql/4.3.0-2023-03-07.sql

@@ -0,0 +1,7 @@
+UPDATE `#__guidedtour_steps`
+SET `target` = '#jform_description,#jform_description_ifr'
+WHERE `target` = '#jform_description';
+
+UPDATE `#__guidedtour_steps`
+SET `target` = '#jform_articletext,#jform_articletext_ifr'
+WHERE `target` = '#jform_articletext';

administrator/components/com_admin/sql/updates/mysql/4.3.0-2023-03-09.sql

@@ -0,0 +1,15 @@
+UPDATE `#__guidedtour_steps`
+SET `target` = '#jform_published'
+WHERE `target` = '#jform_state' AND `id` = 87;
+
+UPDATE `#__guidedtour_steps`
+SET `target` = '#jform_sendEmail0'
+WHERE `target` = '#jform_sendEmail';
+
+UPDATE `#__guidedtour_steps`
+SET `target` = '#jform_block0'
+WHERE `target` = '#jform_block';
+
+UPDATE `#__guidedtour_steps`
+SET `target` = '#jform_requireReset0'
+WHERE `target` = '#jform_requireReset';

administrator/components/com_admin/sql/updates/mysql/4.3.0-2023-03-10.sql

@@ -0,0 +1,19 @@
+UPDATE `#__guidedtour_steps`
+SET `type` = 2, `interactive_type` = 2
+WHERE `id` IN (20,27,28,33,39,40,46,51,56,57,62,67,72,79,84,91,96);
+
+UPDATE `#__guidedtour_steps`
+SET `type` = 2, `interactive_type` = 3
+WHERE `id` IN (5,21,22,23,24,25,26,34,35,36,37,38,52,53,54,55,63,64,65,66,74,75,76,77,78,86,87,88,89,90,98,107,108,109);
+
+UPDATE `#__guidedtour_steps`
+SET `target` = 'joomla-field-fancy-select .choices input'
+WHERE `id` = 5;
+
+UPDATE `#__guidedtour_steps`
+SET `target` = 'joomla-field-fancy-select .choices[data-type=select-one]'
+WHERE `id` IN (23,35,53,65,75,88);
+
+UPDATE `#__guidedtour_steps`
+SET `target` = 'joomla-field-fancy-select .choices[data-type=select-multiple] input'
+WHERE `id` IN (26,38,78,90);

administrator/components/com_admin/sql/updates/postgresql/4.2.9-2023-03-07.sql

@@ -0,0 +1,6 @@
+--
+-- Add post-installation message about setting the Content-Encoding header in .htaccess
+--
+INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled")
+SELECT "extension_id", 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_SETCE_TITLE', 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_SETCE_DESCRIPTION', '', 'com_admin', 1, 'message', '', '', 'admin://components/com_admin/postinstall/htaccesssetce.php', 'admin_postinstall_htaccesssetce_condition', '4.2.9', 1 FROM "#__extensions" WHERE "name" = 'files_joomla'
+ON CONFLICT DO NOTHING;