Merge branch '4.2-dev' into 4.2-finder-memorytable

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.1-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/4.1-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.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/) |
 
 Overview
 ---------------------

administrator/components/com_fields/forms/field.xml

@@ -328,20 +328,6 @@
 					<option value="0">JNO</option>
 				</field>
 			</fieldset>
-			<fieldset name="smartsearchoptions" label="COM_FIELDS_FIELD_SMARTSEARCHOPTIONS_HEADING">
-				<field
-					name="searchindex"
-					type="list"
-					label="COM_FIELDS_FIELD_SEARCHINDEX_LABEL"
-					default="0"
-					validate="options"
-					>
-					<option value="0">COM_FIELDS_FIELD_SEARCHINDEX_DONT</option>
-					<option value="1">COM_FIELDS_FIELD_SEARCHINDEX_SEARCHABLE</option>
-					<option value="2">COM_FIELDS_FIELD_SEARCHINDEX_TAXONOMY</option>
-					<option value="3">COM_FIELDS_FIELD_SEARCHINDEX_BOTH</option>
-				</field>
-			</fieldset>
 		</fieldset>
 	</fields>
 </form>

administrator/components/com_fields/tmpl/field/edit.php

@@ -80,7 +80,6 @@
             <legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
             <div>
             <?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
-            <?php echo $this->form->renderField('searchindexing'); ?>
             </div>
         </fieldset>
         <?php echo HTMLHelper::_('uitab.endTab'); ?>

administrator/components/com_finder/src/Indexer/Helper.php

@@ -16,7 +16,6 @@
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Table\Table;
-use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 
@@ -382,40 +381,6 @@ public static function getContentExtras(Result $item)
         return true;
     }
 
-    /**
-     * Add custom fields for the item to the Result object
-     *
-     * @param   Result  $item     Result object to add the custom fields to
-     * @param   string  $context  Context of the item in the custom fields
-     *
-     * @return  void
-     *
-     * @since   4.2.0
-     */
-    public static function addCustomFields(Result $item, $context)
-    {
-        $obj = new \stdClass();
-        $obj->id = $item->id;
-
-        $fields = FieldsHelper::getFields($context, $obj, true);
-
-        foreach ($fields as $field) {
-            $searchindex = $field->params->get('searchindex', 0);
-
-            // We want to add this field to the search index
-            if ($searchindex == 1 || $searchindex == 3) {
-                $name = 'jsfield_' . $field->name;
-                $item->$name = $field->value;
-                $item->addInstruction(Indexer::META_CONTEXT, $name);
-            }
-
-            // We want to add this field as a taxonomy
-            if (($searchindex == 2 || $searchindex == 3) && $field->value) {
-                $item->addTaxonomy($field->title, $field->value, $field->state, $field->access, $field->language);
-            }
-        }
-    }
-
     /**
      * Method to process content text using the onContentPrepare event trigger.
      *

administrator/language/en-GB/com_fields.ini

@@ -57,14 +57,8 @@ COM_FIELDS_FIELD_RENDER_CLASS_LABEL="Display Class"
 COM_FIELDS_FIELD_RENDEROPTIONS_HEADING="Display Options"
 COM_FIELDS_FIELD_REQUIRED_LABEL="Required"
 COM_FIELDS_FIELD_SAVE_SUCCESS="Field saved"
-COM_FIELDS_FIELD_SEARCHINDEX_BOTH="Make searchable and add as taxonomy"
-COM_FIELDS_FIELD_SEARCHINDEX_DONT="Don't make searchable"
-COM_FIELDS_FIELD_SEARCHINDEX_LABEL="Searchindex"
-COM_FIELDS_FIELD_SEARCHINDEX_SEARCHABLE="Make searchable"
-COM_FIELDS_FIELD_SEARCHINDEX_TAXONOMY="Add as taxonomy"
 COM_FIELDS_FIELD_SHOWLABEL_DESC="Show or Hide the label when the field displays."
 COM_FIELDS_FIELD_SHOWLABEL_LABEL="Label"
-COM_FIELDS_FIELD_SMARTSEARCHOPTIONS_HEADING="Smart Search"
 COM_FIELDS_FIELD_SUFFIX_LABEL="Suffix"
 COM_FIELDS_FIELD_TYPE_LABEL="Type"
 COM_FIELDS_FIELD_USE_GLOBAL="Use settings from Plugin"

administrator/language/en-GB/install.xml

@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>4.2.0</version>
-	<creationDate>2022-06</creationDate>
+	<creationDate>2022-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

administrator/language/en-GB/langmetadata.xml

@@ -2,7 +2,7 @@
 <metafile client="administrator">
 	<name>English (en-GB)</name>
 	<version>4.2.0</version>
-	<creationDate>2022-06</creationDate>
+	<creationDate>2022-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

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.2.0-dev</version>
-	<creationDate>2022-06</creationDate>
+	<version>4.2.0-beta4-dev</version>
+	<creationDate>2022-07</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>

administrator/manifests/packages/pkg_en-GB.xml

@@ -3,7 +3,7 @@
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
 	<version>4.2.0.1</version>
-	<creationDate>2022-06</creationDate>
+	<creationDate>2022-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

api/language/en-GB/install.xml

@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>4.2.0</version>
-	<creationDate>2022-06</creationDate>
+	<creationDate>2022-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

api/language/en-GB/langmetadata.xml

@@ -2,7 +2,7 @@
 <metafile client="api">
 	<name>English (en-GB)</name>
 	<version>4.2.0</version>
-	<creationDate>2022-06</creationDate>
+	<creationDate>2022-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

installation/language/en-GB/langmetadata.xml

@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>English (United Kingdom)</name>
 	<version>4.2.0</version>
-	<creationDate>2022-06</creationDate>
+	<creationDate>2022-07</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>

language/en-GB/install.xml

@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>4.2.0</version>
-	<creationDate>2022-06</creationDate>
+	<creationDate>2022-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

language/en-GB/langmetadata.xml

@@ -2,7 +2,7 @@
 <metafile client="site">
 	<name>English (en-GB)</name>
 	<version>4.2.0</version>
-	<creationDate>2022-06</creationDate>
+	<creationDate>2022-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

libraries/src/Console/ExtensionDiscoverInstallCommand.php

@@ -194,6 +194,7 @@ public function getNote(int $count, int $eid): string
     protected function doExecute(InputInterface $input, OutputInterface $output): int
     {
         $this->configureIO($input, $output);
+        $this->ioStyle->title('Install Discovered Extensions');
 
         if ($eid = $this->cliInput->getOption('eid')) {
             $result = $this->processDiscover($eid);

libraries/src/Console/ExtensionDiscoverListCommand.php

@@ -82,6 +82,7 @@ public function filterExtensionsBasedOnState($extensions, $state): array
     protected function doExecute(InputInterface $input, OutputInterface $output): int
     {
         $this->configureIO($input, $output);
+        $this->ioStyle->title('Discovered Extensions');
 
         $extensions = $this->getExtensions();
         $state = -1;
@@ -96,7 +97,6 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
 
         $discovered_extensions = $this->getExtensionsNameAndId($discovered_extensions);
 
-        $this->ioStyle->title('Discovered Extensions');
         $this->ioStyle->table(['Name', 'Extension ID', 'Version', 'Type', 'Enabled'], $discovered_extensions);
 
         return Command::SUCCESS;

libraries/src/Event/Plugin/System/Webauthn/Ajax.php

@@ -14,7 +14,7 @@
 /**
  * Concrete event class for the onAjaxWebauthn event
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.2.0
  */
 class Ajax extends AbstractImmutableEvent
 {

libraries/src/Event/Plugin/System/Webauthn/AjaxChallenge.php

@@ -17,7 +17,7 @@
 /**
  * Concrete event class for the onAjaxWebauthnChallenge event
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.2.0
  */
 class AjaxChallenge extends AbstractImmutableEvent implements ResultAwareInterface
 {
@@ -29,7 +29,7 @@ class AjaxChallenge extends AbstractImmutableEvent implements ResultAwareInterfa
      * @param   mixed  $data  The data to check
      *
      * @return  void
-     * @since   __DEPLOY_VERSION__
+     * @since   4.2.0
      */
     public function typeCheckResult($data): void
     {

libraries/src/Event/Plugin/System/Webauthn/AjaxCreate.php

@@ -17,7 +17,7 @@
 /**
  * Concrete event class for the onAjaxWebauthnCreate event
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.2.0
  */
 class AjaxCreate extends AbstractImmutableEvent implements ResultAwareInterface
 {

libraries/src/Event/Plugin/System/Webauthn/AjaxDelete.php

@@ -17,7 +17,7 @@
 /**
  * Concrete event class for the onAjaxWebauthnDelete event
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.2.0
  */
 class AjaxDelete extends AbstractImmutableEvent implements ResultAwareInterface
 {

libraries/src/Event/Plugin/System/Webauthn/AjaxInitCreate.php

@@ -18,7 +18,7 @@
 /**
  * Concrete event class for the onAjaxWebauthnInitcreate event
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.2.0
  */
 class AjaxInitCreate extends AbstractImmutableEvent implements ResultAwareInterface
 {
@@ -31,7 +31,7 @@ class AjaxInitCreate extends AbstractImmutableEvent implements ResultAwareInterf
      * @param   string  $name       Event name
      * @param   array   $arguments  Event arguments
      *
-     * @since __DEPLOY_VERSION__
+     * @since 4.2.0
      */
     public function __construct(string $name, array $arguments = [])
     {

libraries/src/Event/Plugin/System/Webauthn/AjaxLogin.php

@@ -14,7 +14,7 @@
 /**
  * Concrete event class for the onAjaxWebauthnLogin event
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.2.0
  */
 class AjaxLogin extends AbstractImmutableEvent
 {

libraries/src/Event/Plugin/System/Webauthn/AjaxSaveLabel.php

@@ -17,7 +17,7 @@
 /**
  * Concrete event class for the onAjaxWebauthnSavelabel event
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.2.0
  */
 class AjaxSaveLabel extends AbstractImmutableEvent implements ResultAwareInterface
 {

libraries/src/Version.php

@@ -62,7 +62,7 @@ final class Version
      * @var    string
      * @since  3.8.0
      */
-    public const EXTRA_VERSION = 'dev';
+    public const EXTRA_VERSION = 'beta4-dev';
 
     /**
      * Development status.
@@ -86,15 +86,15 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const RELDATE = '22-June-2022';
+    public const RELDATE = '5-July-2022';
 
     /**
      * Release time.
      *
      * @var    string
      * @since  3.5
      */
-    public const RELTIME = '17:00';
+    public const RELTIME = '18:17';
 
     /**
      * Release timezone.

plugins/finder/contacts/contacts.php

@@ -356,7 +356,6 @@ protected function index(Result $item)
 
         // Get content extras.
         Helper::getContentExtras($item);
-        Helper::addCustomFields($item, 'com_contact.contact');
 
         // Index the item.
         $this->indexer->index($item);

plugins/finder/content/content.php

@@ -323,7 +323,6 @@ protected function index(Result $item)
 
         // Get content extras.
         Helper::getContentExtras($item);
-        Helper::addCustomFields($item, 'com_content.article');
 
         // Index the item.
         $this->indexer->index($item);

plugins/system/webauthn/services/provider.php

@@ -35,7 +35,7 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.2.0
      */
     public function register(Container $container)
     {
@@ -81,7 +81,7 @@ function (Container $container) {
      *
      * @return \Joomla\Session\SessionInterface|null
      *
-     * @since  __DEPLOY_VERSION__
+     * @since  4.2.0
      */
     private function getSession(ApplicationInterface $app)
     {