Merge branch '4.2-dev' into 4.2-nightly

joomla · May 24, 2022 · d91405e · d91405e
2 parents 67e9491 + 314aa77
commit d91405e
Show file tree

Hide file tree

Showing 43 changed files with 101 additions and 101 deletions.
diff --git a/administrator/components/com_actionlogs/src/Model/ActionlogConfigModel.php b/administrator/components/com_actionlogs/src/Model/ActionlogConfigModel.php
@@ -17,7 +17,7 @@
 /**
  * Model to interact with the action log configuration.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.2.0
  */
 class ActionlogConfigModel extends BaseDatabaseModel
 {
@@ -28,7 +28,7 @@ class ActionlogConfigModel extends BaseDatabaseModel
 	 *
 	 * @return  stdClass|null  An object contains content type parameters, or null if not found
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function getLogContentTypeParams(string $context): ?stdClass
 	{

diff --git a/administrator/components/com_finder/src/Indexer/Helper.php b/administrator/components/com_finder/src/Indexer/Helper.php
@@ -441,7 +441,7 @@ public static function getContentExtras(Result $item)
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public static function addCustomFields(Result $item, $context)
 	{

diff --git a/administrator/components/com_installer/src/Model/DiscoverModel.php b/administrator/components/com_installer/src/Model/DiscoverModel.php
@@ -311,7 +311,7 @@ protected function getEmptyStateQuery()
 	 *
 	 * @return  boolean  True if there are discovered extensions in the database.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function checkExtensions()
 	{

diff --git a/administrator/components/com_menus/src/Model/MenuModel.php b/administrator/components/com_menus/src/Model/MenuModel.php
@@ -398,7 +398,7 @@ public function &getModules()
 	 *
 	 * @return array
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.2.0
 	 */
 	public function getExtensionElementsForMenuItems(array $itemIds): array
 	{

diff --git a/administrator/language/en-GB/install.xml b/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-04</creationDate>
+	<creationDate>2022-05</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/administrator/language/en-GB/langmetadata.xml b/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-04</creationDate>
+	<creationDate>2022-05</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/administrator/manifests/files/joomla.xml b/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-alpha3-dev</version>
-	<creationDate>2022-04</creationDate>
+	<version>4.2.0-beta1-dev</version>
+	<creationDate>2022-05</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>

diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/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-04</creationDate>
+	<creationDate>2022-05</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/api/language/en-GB/install.xml b/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-04</creationDate>
+	<creationDate>2022-05</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/api/language/en-GB/langmetadata.xml b/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-04</creationDate>
+	<creationDate>2022-05</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/installation/language/en-GB/langmetadata.xml b/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-04</creationDate>
+	<creationDate>2022-05</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>

diff --git a/installation/src/Form/Field/Installation/LanguageField.php b/installation/src/Form/Field/Installation/LanguageField.php
@@ -41,7 +41,7 @@ class LanguageField extends ListField
 	 *
 	 * @return  boolean  True on success.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function setup(\SimpleXMLElement $element, $value, $group = null)
 	{
@@ -109,7 +109,7 @@ protected function _sortLanguages($a, $b)
 	 *
 	 * @return  string  The native language to use
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	protected function getNativeLanguage()
 	{

diff --git a/language/en-GB/install.xml b/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-04</creationDate>
+	<creationDate>2022-05</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="site">
 	<name>English (en-GB)</name>
 	<version>4.2.0</version>
-	<creationDate>2022-04</creationDate>
+	<creationDate>2022-05</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/libraries/src/Application/CMSApplication.php b/libraries/src/Application/CMSApplication.php
@@ -133,7 +133,7 @@ abstract class CMSApplication extends WebApplication implements ContainerAwareIn
 	 * Menu instances container.
 	 *
 	 * @var    AbstractMenu[]
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.2.0
 	 */
 	protected $menus = [];
 
@@ -142,7 +142,7 @@ abstract class CMSApplication extends WebApplication implements ContainerAwareIn
 	 *
 	 * @var   MenuFactoryInterface
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.2.0
 	 */
 	private $menuFactory;
 
@@ -1492,7 +1492,7 @@ private function setupLogging(): void
 	 *
 	 * @return void
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.2.0
 	 */
 	public function setMenuFactory(MenuFactoryInterface $menuFactory): void
 	{

diff --git a/libraries/src/Event/CoreEventAware.php b/libraries/src/Event/CoreEventAware.php
@@ -46,7 +46,7 @@
 /**
  * Returns the most suitable event class for a Joomla core event name
  *
- * @since __DEPLOY_VERSION__
+ * @since 4.2.0
  */
 trait CoreEventAware
 {
@@ -57,7 +57,7 @@ trait CoreEventAware
 	 * PHP logic in the getEventClassByEventName class.
 	 *
 	 * @var   array
-	 * @since __DEPLOY_VERSION__
+	 * @since 4.2.0
 	 */
 	private static $eventNameToConcreteClass = [
 		// Model
@@ -108,7 +108,7 @@ trait CoreEventAware
 	 * @param   string  $eventName  The event name
 	 *
 	 * @return  string The event class name
-	 * @since __DEPLOY_VERSION__
+	 * @since 4.2.0
 	 */
 	protected static function getEventClassByEventName(string $eventName): string
 	{

diff --git a/libraries/src/Event/QuickIcon/GetIconEvent.php b/libraries/src/Event/QuickIcon/GetIconEvent.php
@@ -21,7 +21,7 @@
 /**
  * Event class for the onGetIcon event.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.2.0
  */
 class GetIconEvent extends AbstractImmutableEvent implements ResultAwareInterface
 {
@@ -35,7 +35,7 @@ class GetIconEvent extends AbstractImmutableEvent implements ResultAwareInterfac
 	 * @param   string  $name       The event name.
 	 * @param   array   $arguments  The event arguments.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 * @throws  BadMethodCallException
 	 */
 	public function __construct(string $name, array $arguments = [])
@@ -52,7 +52,7 @@ public function __construct(string $name, array $arguments = [])
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function setContext(string $value)
 	{

diff --git a/libraries/src/Event/ReshapeArgumentsAware.php b/libraries/src/Event/ReshapeArgumentsAware.php
@@ -49,7 +49,7 @@
  * be using concrete event classes with named arguments, removing legacy listeners and their
  * positional arguments headaches.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.2.0
  *
  * @deprecated 5.0
  */
@@ -64,7 +64,7 @@ trait ReshapeArgumentsAware
 	 *
 	 * @return  array  The reshaped arguments.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	protected function reshapeArguments(array $arguments, array $argumentNames, array $defaults = [])
 	{

diff --git a/libraries/src/Event/Result/ResultAware.php b/libraries/src/Event/Result/ResultAware.php
@@ -19,18 +19,18 @@
  * You must additionally implement the typeCheckResult method or use one of the ResultType*Aware
  * traits in your Event handler.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.2.0
  */
 trait ResultAware
 {
 	/**
 	 * Disallow setting the result argument directly with setArgument() instead of going through addResult().
 	 *
-	 * You should set this to true ONLY for event names which did NOT exist before Joomla __DEPLOY_VERSION__
+	 * You should set this to true ONLY for event names which did NOT exist before Joomla 4.2.0
 	 * or if you are a third party developer introducing new event names for use only in your software.
 	 *
 	 * @var    boolean
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.2.0
 	 *
 	 * @deprecated 5.0 Using setArgument() for the result argument will always be disallowed.
 	 */
@@ -42,7 +42,7 @@ trait ResultAware
 	 * @param   mixed  $data  What to add to the result array.
 	 *
 	 * @return  void
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function addResult($data): void
 	{
@@ -83,7 +83,7 @@ public function addResult($data): void
 	 * @param   array  $value  The new result array.
 	 *
 	 * @return  array
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	protected function setResult(array $value)
 	{

diff --git a/libraries/src/Event/Result/ResultAwareInterface.php b/libraries/src/Event/Result/ResultAwareInterface.php
@@ -23,7 +23,7 @@
  * trait and one of the ResultType*Aware traits. For example, if your event returns boolean results
  * you need to use the ResultAware and ResultTypeBooleanAware traits in your event.
  *
- * @since __DEPLOY_VERSION__
+ * @since 4.2.0
  */
 interface ResultAwareInterface
 {
@@ -33,7 +33,7 @@ interface ResultAwareInterface
 	 * @param   mixed  $data  What to add to the result array.
 	 *
 	 * @return  void
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function addResult($data): void;
 
@@ -46,7 +46,7 @@ public function addResult($data): void;
 	 * @throws  InvalidArgumentException
 	 *
 	 * @internal
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function typeCheckResult($data): void;
 }
diff --git a/libraries/src/Event/Result/ResultTypeArrayAware.php b/libraries/src/Event/Result/ResultTypeArrayAware.php
@@ -18,23 +18,23 @@
  * Events using this Trait (and the ResultAware trait) will expect event handlers to set results
  * of an Array type.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.2.0
  */
 trait ResultTypeArrayAware
 {
 	/**
 	 * Can the result attribute values also be NULL?
 	 *
 	 * @var    boolean
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.2.0
 	 */
 	protected $resultIsNullable = false;
 
 	/**
 	 * Can the result attribute values also be boolean FALSE?
 	 *
 	 * @var    boolean
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.2.0
 	 *
 	 * @deprecated 5.0 You should use nullable values or exceptions instead of returning boolean false results.
 	 */
@@ -49,7 +49,7 @@ trait ResultTypeArrayAware
 	 * @throws  InvalidArgumentException
 	 *
 	 * @internal
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function typeCheckResult($data): void
 	{

diff --git a/libraries/src/Event/Result/ResultTypeBooleanAware.php b/libraries/src/Event/Result/ResultTypeBooleanAware.php
@@ -18,15 +18,15 @@
  * Events using this Trait (and the ResultAware trait) will expect event handlers to set results
  * of a Boolean type.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.2.0
  */
 trait ResultTypeBooleanAware
 {
 	/**
 	 * Can the result attribute values also be NULL?
 	 *
 	 * @var    boolean
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.2.0
 	 */
 	protected $resultIsNullable = false;
 
@@ -39,7 +39,7 @@ trait ResultTypeBooleanAware
 	 * @throws  InvalidArgumentException
 	 *
 	 * @internal
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function typeCheckResult($data): void
 	{