Merge branch '4.2-dev' into replace_factory_getapplication_in_control…

…lers
joomla · Jun 23, 2022 · 4fa4485 · 4fa4485
2 parents 094660f + b12020a
commit 4fa4485
Show file tree

Hide file tree

Showing 40 changed files with 106 additions and 106 deletions.
diff --git a/administrator/components/com_joomlaupdate/extract.php b/administrator/components/com_joomlaupdate/extract.php
@@ -1946,7 +1946,7 @@ function getConfiguration(): ?array
  * Sets the PHP timeout to 3600 seconds
  *
  * @return  void
- * @since   __DEPLOY_VERSION__
+ * @since   4.2.0
  */
 function setLongTimeout()
 {
@@ -1962,7 +1962,7 @@ function setLongTimeout()
  * Sets the memory limit to 1GiB
  *
  * @return  void
- * @since   __DEPLOY_VERSION__
+ * @since   4.2.0
  */
 function setHugeMemoryLimit()
 {

diff --git a/administrator/components/com_joomlaupdate/src/Controller/UpdateController.php b/administrator/components/com_joomlaupdate/src/Controller/UpdateController.php
@@ -588,7 +588,7 @@ public function fetchExtensionCompatibility()
 	 * Called by the Joomla Update JavaScript (PreUpdateChecker.checkNextChunk).
 	 *
 	 * @return  void
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 *
 	 */
 	public function batchextensioncompatibility()

diff --git a/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php b/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php
@@ -119,15 +119,15 @@ class HtmlView extends BaseHtmlView
 	 * Should I disable the confirmation checkbox for pre-update extension version checks?
 	 *
 	 * @var   boolean
-	 * @since __DEPLOY_VERSION__
+	 * @since 4.2.0
 	 */
 	protected $noVersionCheck = false;
 
 	/**
 	 * Should I disable the confirmation checkbox for taking a backup before updating?
 	 *
 	 * @var   boolean
-	 * @since __DEPLOY_VERSION__
+	 * @since 4.2.0
 	 */
 	protected $noBackupCheck = false;
 

diff --git a/administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php b/administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php
@@ -55,7 +55,7 @@ class HtmlView extends BaseHtmlView
 	 * Should I disable the confirmation checkbox for taking a backup before updating?
 	 *
 	 * @var   boolean
-	 * @since __DEPLOY_VERSION__
+	 * @since 4.2.0
 	 */
 	protected $noBackupCheck = false;
 

diff --git a/administrator/components/com_messages/src/Model/MessagesModel.php b/administrator/components/com_messages/src/Model/MessagesModel.php
@@ -174,7 +174,7 @@ protected function getListQuery()
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function purge(int $userId): void
 	{

diff --git a/administrator/components/com_postinstall/src/Controller/MessageController.php b/administrator/components/com_postinstall/src/Controller/MessageController.php
@@ -79,7 +79,7 @@ public function unpublish()
 	 *
 	 * @return   void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function republish()
 	{
@@ -105,7 +105,7 @@ public function republish()
 	 *
 	 * @return   void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function archive()
 	{

diff --git a/administrator/components/com_postinstall/src/Model/MessagesModel.php b/administrator/components/com_postinstall/src/Model/MessagesModel.php
@@ -127,7 +127,7 @@ public function unpublishMessage($id)
 	 *
 	 * @return   void
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since    4.2.0
 	 */
 	public function archiveMessage($id)
 	{
@@ -152,7 +152,7 @@ public function archiveMessage($id)
 	 *
 	 * @return   void
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since    4.2.0
 	 */
 	public function republishMessage($id)
 	{

diff --git a/administrator/components/com_templates/src/Model/StyleModel.php b/administrator/components/com_templates/src/Model/StyleModel.php
@@ -743,7 +743,7 @@ public function getHelp()
 	 *
 	 * @return  stdClass
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function getAdminTemplate(int $styleId): stdClass
 	{
@@ -789,7 +789,7 @@ public function getAdminTemplate(int $styleId): stdClass
 	 *
 	 * @return  array
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function getSiteTemplates(): array
 	{

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.2.0-beta2-dev</version>
+	<version>4.2.0-dev</version>
 	<creationDate>2022-06</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 

diff --git a/build/media_source/system/js/core.es6.js b/build/media_source/system/js/core.es6.js
@@ -573,7 +573,7 @@ window.Joomla.Modal = window.Joomla.Modal || {
    *
    * @type  {Array}
    *
-   * @since __DEPLOY_VERSION__
+   * @since 4.2.0
    */
   const requestQueue = [];
 
@@ -582,7 +582,7 @@ window.Joomla.Modal = window.Joomla.Modal || {
    *
    * @type  {boolean}
    *
-   * @since __DEPLOY_VERSION__
+   * @since 4.2.0
    */
   let performingQueuedRequest = false;
 
@@ -624,7 +624,7 @@ window.Joomla.Modal = window.Joomla.Modal || {
     /**
      * Processes queued Request objects.
      *
-     * @since __DEPLOY_VERSION__
+     * @since 4.2.0
      */
     const processQueuedRequests = () => {
       if (performingQueuedRequest || requestQueue.length === 0) {

diff --git a/components/com_tags/src/Helper/RouteHelper.php b/components/com_tags/src/Helper/RouteHelper.php
@@ -105,7 +105,7 @@ public static function getTagRoute($id)
 	 *
 	 * @return  string  URL link to pass to the router
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 * @throws  Exception
 	 */
 	public static function getComponentTagRoute(string $id, string $language = '*'): string
@@ -167,7 +167,7 @@ public static function getTagsRoute()
 	 *
 	 * @return  string  URL link to pass to the router
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 * @throws  Exception
 	 */
 	public static function getComponentTagsRoute(string $language = '*'): string

diff --git a/components/com_users/src/Model/LoginModel.php b/components/com_users/src/Model/LoginModel.php
@@ -128,7 +128,7 @@ protected function preprocessForm(Form $form, $data, $group = 'user')
 	 *
 	 * @return string
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.2.0
 	 */
 	public function getMenuLanguage(int $id): string
 	{

diff --git a/libraries/src/Cache/CacheControllerFactoryAwareInterface.php b/libraries/src/Cache/CacheControllerFactoryAwareInterface.php
@@ -13,7 +13,7 @@
 /**
  * Interface to be implemented by classes depending on a cache controller factory.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.2.0
  */
 interface CacheControllerFactoryAwareInterface
 {
@@ -24,7 +24,7 @@ interface CacheControllerFactoryAwareInterface
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function setCacheControllerFactory(CacheControllerFactoryInterface $factory): void;
 }
diff --git a/libraries/src/Cache/CacheControllerFactoryAwareTrait.php b/libraries/src/Cache/CacheControllerFactoryAwareTrait.php
@@ -15,7 +15,7 @@
 /**
  * Defines the trait for a CacheControllerFactoryInterface Aware Class.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.2.0
  */
 trait CacheControllerFactoryAwareTrait
 {
@@ -24,7 +24,7 @@ trait CacheControllerFactoryAwareTrait
 	 *
 	 * @var    CacheControllerFactoryInterface
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.2.0
 	 */
 	private $cacheControllerFactory;
 
@@ -33,7 +33,7 @@ trait CacheControllerFactoryAwareTrait
 	 *
 	 * @return  CacheControllerFactoryInterface
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	protected function getCacheControllerFactory(): CacheControllerFactoryInterface
 	{
@@ -57,7 +57,7 @@ protected function getCacheControllerFactory(): CacheControllerFactoryInterface
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function setCacheControllerFactory(CacheControllerFactoryInterface $cacheControllerFactory = null): void
 	{

diff --git a/libraries/src/Console/AddUserCommand.php b/libraries/src/Console/AddUserCommand.php
@@ -104,7 +104,7 @@ class AddUserCommand extends AbstractCommand
 	 *
 	 * @param   DatabaseInterface  $db  The database
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function __construct(DatabaseInterface $db)
 	{

diff --git a/libraries/src/Console/AddUserToGroupCommand.php b/libraries/src/Console/AddUserToGroupCommand.php
@@ -78,7 +78,7 @@ class AddUserToGroupCommand extends AbstractCommand
 	 *
 	 * @param   DatabaseInterface  $db  The database
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function __construct(DatabaseInterface $db)
 	{

diff --git a/libraries/src/Console/DeleteUserCommand.php b/libraries/src/Console/DeleteUserCommand.php
@@ -69,7 +69,7 @@ class DeleteUserCommand extends AbstractCommand
 	 *
 	 * @param   DatabaseInterface  $db  The database
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function __construct(DatabaseInterface $db)
 	{

diff --git a/libraries/src/Console/ExtensionRemoveCommand.php b/libraries/src/Console/ExtensionRemoveCommand.php
@@ -99,7 +99,7 @@ class ExtensionRemoveCommand extends AbstractCommand
 	 *
 	 * @param   DatabaseInterface  $db  The database
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function __construct(DatabaseInterface $db)
 	{

diff --git a/libraries/src/Console/ListUserCommand.php b/libraries/src/Console/ListUserCommand.php
@@ -48,7 +48,7 @@ class ListUserCommand extends AbstractCommand
 	 *
 	 * @param   DatabaseInterface  $db  The database
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function __construct(DatabaseInterface $db)
 	{

diff --git a/libraries/src/Console/RemoveUserFromGroupCommand.php b/libraries/src/Console/RemoveUserFromGroupCommand.php
@@ -78,7 +78,7 @@ class RemoveUserFromGroupCommand extends AbstractCommand
 	 *
 	 * @param   DatabaseInterface  $db  The database
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function __construct(DatabaseInterface $db)
 	{

diff --git a/libraries/src/Installer/InstallerAdapter.php b/libraries/src/Installer/InstallerAdapter.php
@@ -1395,7 +1395,7 @@ public function update()
 	 *
 	 * @return  mixed  The value of the element if set, null otherwise
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 *
 	 * @deprecated  5.0 Use getDatabase() instead of directly accessing db
 	 */

diff --git a/libraries/src/MVC/Factory/MVCFactory.php b/libraries/src/MVC/Factory/MVCFactory.php
@@ -366,7 +366,7 @@ private function setRouterOnObject($object): void
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	private function setCacheControllerOnObject($object): void
 	{

diff --git a/libraries/src/Plugin/CMSPlugin.php b/libraries/src/Plugin/CMSPlugin.php
@@ -81,7 +81,7 @@ abstract class CMSPlugin implements DispatcherAwareInterface, PluginInterface
 	 *
 	 * @var    CMSApplicationInterface
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.2.0
 	 */
 	private $application;
 
@@ -195,7 +195,7 @@ public function loadLanguage($extension = '', $basePath = JPATH_ADMINISTRATOR)
 	 *
 	 * @return  string  The translated string
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 *
 	 * @see     sprintf
 	 */
@@ -406,7 +406,7 @@ private function parameterImplementsEventInterface(\ReflectionParameter $paramet
 	 *
 	 * @return  CMSApplicationInterface|null
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	protected function getApplication(): ?CMSApplicationInterface
 	{
@@ -420,7 +420,7 @@ protected function getApplication(): ?CMSApplicationInterface
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function setApplication(CMSApplicationInterface $application): void
 	{

diff --git a/libraries/src/Version.php b/libraries/src/Version.php
@@ -63,7 +63,7 @@ final class Version
 	 * @var    string
 	 * @since  3.8.0
 	 */
-	const EXTRA_VERSION = 'beta2-dev';
+	const EXTRA_VERSION = 'dev';
 
 	/**
 	 * Development status.
@@ -87,15 +87,15 @@ final class Version
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELDATE = '7-June-2022';
+	const RELDATE = '22-June-2022';
 
 	/**
 	 * Release time.
 	 *
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELTIME = '16:53';
+	const RELTIME = '17:00';
 
 	/**
 	 * Release timezone.

diff --git a/plugins/behaviour/taggable/services/provider.php b/plugins/behaviour/taggable/services/provider.php
@@ -25,7 +25,7 @@
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function register(Container $container)
 	{

diff --git a/plugins/behaviour/taggable/src/Extension/Taggable.php b/plugins/behaviour/taggable/src/Extension/Taggable.php
@@ -40,7 +40,7 @@ final class Taggable extends CMSPlugin implements SubscriberInterface
 	 *
 	 * @return  array
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public static function getSubscribedEvents(): array
 	{

diff --git a/plugins/behaviour/versionable/services/provider.php b/plugins/behaviour/versionable/services/provider.php
@@ -28,7 +28,7 @@
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.2.0
 	 */
 	public function register(Container $container)
 	{