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

joomla · Jan 24, 2022 · 13a25db · 13a25db
2 parents 25d4cee + 541c99f
commit 13a25db
Show file tree

Hide file tree

Showing 126 changed files with 325 additions and 281 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -415,11 +415,11 @@ steps:
         path: /reference
     when:
       branch:
-        - 4.1-dev
+        - 4.2-dev
 
 
 ---
 kind: signature
-hmac: daa8e5588cc88058bc57aadf35e3d9dd55eefaa9419c457ce374a0dd19eb7cda
+hmac: d9707d261edba35bc6b70f09a1babee119cb0a88cebda40171248e5c0a8b135e
 
 ...
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Joomla! CMS™ 
+Joomla! CMS™
 ====================
 
 Build Status
@@ -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.0-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?
 ---------------------
@@ -47,7 +47,7 @@ cd joomla-cms
 ```
 - Go to the 4.0-dev branch:
 ```bash
-git checkout 4.0-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.0-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_associations/src/Helper/AssociationsHelper.php b/administrator/components/com_associations/src/Helper/AssociationsHelper.php
@@ -106,7 +106,7 @@ public static function getItem($extensionName, $typeName, $itemId)
 	{
 		if (!self::hasSupport($extensionName))
 		{
-			return array();
+			return null;
 		}
 
 		// Get the extension specific helper method
@@ -176,7 +176,7 @@ private static function loadHelper($extensionName)
 	 *
 	 * @param   string  $extensionName  The extension name with com_
 	 *
-	 * @return  boolean
+	 * @return  string
 	 *
 	 * @since  3.7.0
 	 */

diff --git a/administrator/components/com_categories/src/Model/CategoryModel.php b/administrator/components/com_categories/src/Model/CategoryModel.php
@@ -345,7 +345,7 @@ protected function loadFormData()
 			if (!$data->id)
 			{
 				// Check for which extension the Category Manager is used and get selected fields
-				$extension = substr($app->getUserState('com_categories.categories.filter.extension'), 4);
+				$extension = substr($app->getUserState('com_categories.categories.filter.extension', ''), 4);
 				$filters = (array) $app->getUserState('com_categories.categories.' . $extension . '.filter');
 
 				$data->set(

diff --git a/administrator/components/com_config/src/View/Component/HtmlView.php b/administrator/components/com_config/src/View/Component/HtmlView.php
@@ -66,7 +66,7 @@ public function display($tpl = null)
 
 			if (!$component->enabled)
 			{
-				return false;
+				return;
 			}
 
 			$form = $this->get('form');
@@ -76,7 +76,7 @@ public function display($tpl = null)
 		{
 			Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
 
-			return false;
+			return;
 		}
 
 		$this->fieldsets   = $form ? $form->getFieldsets() : null;

diff --git a/administrator/components/com_contact/src/Service/HTML/AdministratorService.php b/administrator/components/com_contact/src/Service/HTML/AdministratorService.php
@@ -34,7 +34,7 @@ class AdministratorService
 	 *
 	 * @return  string  The language HTML
 	 *
-	 * @throws  Exception
+	 * @throws  \Exception
 	 */
 	public function association($contactid)
 	{

diff --git a/administrator/components/com_content/forms/article.xml b/administrator/components/com_content/forms/article.xml
@@ -920,11 +920,13 @@
 		<field
 			name="introtext"
 			label="COM_CONTENT_FIELD_INTROTEXT"
+			filter="JComponentHelper::filterText"
 		/>
 
 		<field
 			name="fulltext"
 			label="COM_CONTENT_FIELD_FULLTEXT"
+			filter="JComponentHelper::filterText"
 		/>
 	</fields>
 

diff --git a/administrator/components/com_content/src/Model/ArticleModel.php b/administrator/components/com_content/src/Model/ArticleModel.php
@@ -11,6 +11,7 @@
 
 \defined('_JEXEC') or die;
 
+use Joomla\CMS\Date\Date;
 use Joomla\CMS\Event\AbstractEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\InputFilter;

diff --git a/administrator/components/com_content/src/Model/ArticlesModel.php b/administrator/components/com_content/src/Model/ArticlesModel.php
@@ -88,7 +88,7 @@ public function __construct($config = array())
 	 * @param   array    $data      data
 	 * @param   boolean  $loadData  load current data
 	 *
-	 * @return  Form|null  The \JForm object or null if the form can't be found
+	 * @return  \Joomla\CMS\Form\Form|null  The Form object or null if the form can't be found
 	 *
 	 * @since   3.2
 	 */

diff --git a/administrator/components/com_fields/src/Plugin/FieldsPlugin.php b/administrator/components/com_fields/src/Plugin/FieldsPlugin.php
@@ -148,11 +148,6 @@ public function onCustomFieldsPrepareField($context, $item, $field)
 		// Get the path for the layout file
 		$path = PluginHelper::getLayoutPath('fields', $this->_name, $field->type);
 
-		if (!file_exists($path))
-		{
-			$path = PluginHelper::getLayoutPath('fields', $this->_name, $field->type);
-		}
-
 		// Render the layout
 		ob_start();
 		include $path;
@@ -269,8 +264,8 @@ public function onContentPrepareForm(Form $form, $data)
 	/**
 	 * Returns the path of the XML definition file for the field parameters
 	 *
-	 * @param   Form      $form  The form
-	 * @param   stdClass  $data  The data
+	 * @param   Form       $form  The form
+	 * @param   \stdClass  $data  The data
 	 *
 	 * @return  string
 	 *

diff --git a/administrator/components/com_finder/src/Field/ContentmapField.php b/administrator/components/com_finder/src/Field/ContentmapField.php
@@ -79,7 +79,7 @@ protected function getGroups()
 		}
 		catch (\RuntimeException $e)
 		{
-			return;
+			return [];
 		}
 
 		// Build the grouped list array.

diff --git a/administrator/components/com_finder/src/Indexer/Query.php b/administrator/components/com_finder/src/Indexer/Query.php
@@ -1065,7 +1065,6 @@ protected function processString($input, $lang, $mode)
 
 					// Adjust the loop.
 					$i += 2;
-					continue;
 				}
 				// Handle the OR operator.
 				elseif ($op === 'OR' && isset($terms[$i + 2]))
@@ -1135,7 +1134,6 @@ protected function processString($input, $lang, $mode)
 
 					// Adjust the loop.
 					$i += 2;
-					continue;
 				}
 			}
 			// Handle an orphaned OR operator.
@@ -1183,7 +1181,6 @@ protected function processString($input, $lang, $mode)
 
 				// Adjust the loop.
 				$i++;
-				continue;
 			}
 			// Handle the NOT operator.
 			elseif (isset($terms[$i + 1]) && array_search($terms[$i], $operators, true) === 'NOT')

diff --git a/administrator/components/com_installer/src/Controller/UpdateController.php b/administrator/components/com_installer/src/Controller/UpdateController.php
@@ -108,14 +108,14 @@ public function find()
 		if ($disabledUpdateSites)
 		{
 			$updateSitesUrl = Route::_('index.php?option=com_installer&view=updatesites');
-			$this->setMessage(Text::sprintf('COM_INSTALLER_MSG_UPDATE_SITES_COUNT_CHECK', $updateSitesUrl), 'warning');
+			$this->app->enqueueMessage(Text::sprintf('COM_INSTALLER_MSG_UPDATE_SITES_COUNT_CHECK', $updateSitesUrl), 'warning');
 		}
 
 		$model->findUpdates(0, $cache_timeout, $minimum_stability);
 
 		if (0 === $model->getTotal())
 		{
-			$this->setMessage(Text::_('COM_INSTALLER_MSG_UPDATE_NOUPDATES'), 'info');
+			$this->app->enqueueMessage(Text::_('COM_INSTALLER_MSG_UPDATE_NOUPDATES'), 'info');
 		}
 
 		$this->setRedirect(Route::_('index.php?option=com_installer&view=update', false));

diff --git a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
@@ -1073,7 +1073,7 @@ public function removePackageFiles()
 
 		foreach ($files as $file)
 		{
-			if (File::exists($file))
+			if ($file !== null && File::exists($file))
 			{
 				File::delete($file);
 			}

diff --git a/administrator/components/com_languages/src/Model/InstalledModel.php b/administrator/components/com_languages/src/Model/InstalledModel.php
@@ -239,7 +239,6 @@ public function getData()
 					&& stripos($installedLanguage->language, $search) === false)
 				{
 					unset($installedLanguages[$key]);
-					continue;
 				}
 			}
 		}

diff --git a/administrator/components/com_mails/forms/template.xml b/administrator/components/com_mails/forms/template.xml
@@ -28,7 +28,8 @@
 			name="htmlbody"
 			type="editor"
 			label="COM_MAILS_FIELD_HTMLBODY_LABEL"
-			buttons="false"
+			buttons="true"
+			hide="fields,pagebreak,readmore,module"
 			class="inputbox"
 			filter="JComponentHelper::filterText"
 		/>

diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/image.vue b/administrator/components/com_media/resources/scripts/components/browser/items/image.vue
@@ -4,15 +4,17 @@
     @dblclick="openPreview()"
     @mouseleave="hideActions()"
   >
-    <div class="media-browser-item-preview">
+    <div class="media-browser-item-preview"
+    :title="item.name">
       <div class="image-background">
         <div
           class="image-cropped"
           :style="{ backgroundImage: getHashedURL }"
         />
       </div>
     </div>
-    <div class="media-browser-item-info">
+    <div class="media-browser-item-info"
+    :title="item.name">
       {{ item.name }} {{ item.filetype }}
     </div>
     <span

diff --git a/administrator/components/com_media/src/Adapter/AdapterInterface.php b/administrator/components/com_media/src/Adapter/AdapterInterface.php
@@ -104,7 +104,7 @@ public function createFolder(string $name, string $path): string;
 	 *
 	 * @param   string  $name  The name
 	 * @param   string  $path  The folder
-	 * @param   binary  $data  The data
+	 * @param   string  $data  The data
 	 *
 	 * @return  string
 	 *
@@ -118,7 +118,7 @@ public function createFile(string $name, string $path, $data): string;
 	 *
 	 * @param   string  $name  The name
 	 * @param   string  $path  The folder
-	 * @param   binary  $data  The data
+	 * @param   string  $data  The data
 	 *
 	 * @return  void
 	 *

diff --git a/administrator/components/com_media/src/Controller/DisplayController.php b/administrator/components/com_media/src/Controller/DisplayController.php
@@ -36,7 +36,7 @@ class DisplayController extends BaseController
 	 * @param   string  $prefix  The class prefix. Optional.
 	 * @param   array   $config  Configuration array for view. Optional.
 	 *
-	 * @return  \Joomla\CMS\MVC\View\AbstractView  Reference to the view or an error.
+	 * @return  \Joomla\CMS\MVC\View\ViewInterface  Reference to the view or an error.
 	 *
 	 * @since   3.0
 	 * @throws  \Exception

diff --git a/administrator/components/com_media/src/Model/ApiModel.php b/administrator/components/com_media/src/Model/ApiModel.php
@@ -220,7 +220,7 @@ public function createFolder($adapter, $name, $path, $override)
 	 * @param   string   $adapter   The adapter
 	 * @param   string   $name      The name
 	 * @param   string   $path      The folder
-	 * @param   binary   $data      The data
+	 * @param   string   $data      The data
 	 * @param   boolean  $override  Should the file being overridden when it exists
 	 *
 	 * @return  string
@@ -286,7 +286,7 @@ public function createFile($adapter, $name, $path, $data, $override)
 	 * @param   string  $adapter  The adapter
 	 * @param   string  $name     The name
 	 * @param   string  $path     The folder
-	 * @param   binary  $data     The data
+	 * @param   string  $data     The data
 	 *
 	 * @return  void
 	 *

diff --git a/administrator/components/com_menus/src/Field/MenuOrderingField.php b/administrator/components/com_menus/src/Field/MenuOrderingField.php
@@ -35,7 +35,7 @@ class MenuOrderingField extends ListField
 	 * Method to get the list of siblings in a menu.
 	 * The method requires that parent be set.
 	 *
-	 * @return  array  The field option objects or false if the parent field has not been set
+	 * @return  array|boolean  The field option objects or false if the parent field has not been set
 	 *
 	 * @since   1.7
 	 */

diff --git a/administrator/components/com_menus/src/Helper/MenusHelper.php b/administrator/components/com_menus/src/Helper/MenusHelper.php
@@ -136,7 +136,7 @@ public static function getMenuTypes($clientId = 0)
 	 * @param   array    $languages  Optional array of specify which languages we want to filter
 	 * @param   int      $clientId   Optional client id - viz 0 = site, 1 = administrator, can be NULL for all (used only if menutype not given)
 	 *
-	 * @return  array
+	 * @return  array|boolean
 	 *
 	 * @since   1.6
 	 */

diff --git a/administrator/components/com_modules/tmpl/module/edit.php b/administrator/components/com_modules/tmpl/module/edit.php
@@ -107,7 +107,7 @@
 							<p><?php echo $short_description; ?></p>
 							<?php if ($long_description) : ?>
 								<p class="readmore">
-									<a href="#" onclick="document.querySelector('#tab-description').click();">
+									<a href="#" onclick="document.getElementById('myTab').activateTab(document.getElementById('description'));">
 										<?php echo Text::_('JGLOBAL_SHOW_FULL_DESCRIPTION'); ?>
 									</a>
 								</p>

diff --git a/administrator/components/com_templates/src/Model/TemplateModel.php b/administrator/components/com_templates/src/Model/TemplateModel.php
@@ -273,9 +273,9 @@ function ($a, $b)
 	/**
 	 * Prepare core files.
 	 *
-	 * @param   string    $dir       The path of the directory to scan.
-	 * @param   string    $element   The path of the template element.
-	 * @param   stdClass  $template  The stdClass object of template.
+	 * @param   string     $dir       The path of the directory to scan.
+	 * @param   string     $element   The path of the template element.
+	 * @param   \stdClass  $template  The stdClass object of template.
 	 *
 	 * @return  array
 	 *

diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
@@ -2,7 +2,7 @@
 <extension client="administrator" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>4.1.0</version>
+	<version>4.2.0</version>
 	<creationDate>January 2022</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="administrator">
 	<name>English (en-GB)</name>
-	<version>4.1.0</version>
+	<version>4.2.0</version>
 	<creationDate>January 2022</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
@@ -6,7 +6,7 @@
 	<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.1.0-dev</version>
+	<version>4.2.0-dev</version>
 	<creationDate>January 2022</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 

diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml
@@ -2,7 +2,7 @@
 <extension type="package" method="upgrade">
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
-	<version>4.1.0.1</version>
+	<version>4.2.0.1</version>
 	<creationDate>January 2022</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/administrator/modules/mod_sampledata/tmpl/default.php b/administrator/modules/mod_sampledata/tmpl/default.php
@@ -32,7 +32,7 @@
 		<?php foreach($items as $i => $item) : ?>
 			<li class="list-group-item sampledata-<?php echo $item->name; ?>">
 				<div class="d-flex justify-content-between align-items-center">
-					<div class="sample-data__title me-2">
+					<div class="sample-data__title">
 						<span class="sample-data__icon icon-<?php echo $item->icon; ?> me-1" aria-hidden="true"></span>
 						<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>
 					</div>

diff --git a/api/language/en-GB/install.xml b/api/language/en-GB/install.xml
@@ -2,7 +2,7 @@
 <extension client="api" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>4.1.0</version>
+	<version>4.2.0</version>
 	<creationDate>January 2022</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>