Merge branch '5.2-dev' into patch-2

administrator/components/com_mails/src/View/Template/HtmlView.php

@@ -136,17 +136,11 @@ protected function addToolbar()
             'pencil-2 article-add'
         );
 
-        $saveGroup = $toolbar->dropdownButton('save-group');
-
-        $saveGroup->configure(
-            function (Toolbar $childBar) {
-                $childBar->apply('template.apply');
-                $childBar->save('template.save');
-            }
-        );
-
+        $toolbar->apply('template.apply');
+        $toolbar->divider();
+        $toolbar->save('template.save');
+        $toolbar->divider();
         $toolbar->cancel('template.cancel', 'JTOOLBAR_CLOSE');
-
         $toolbar->divider();
         $toolbar->help('Mail_Template:_Edit');
     }

libraries/src/Event/CoreEventAware.php

@@ -124,6 +124,10 @@ trait CoreEventAware
         'onUserBeforeDelete'         => User\BeforeDeleteEvent::class,
         'onUserAfterDelete'          => User\AfterDeleteEvent::class,
         'onUserAfterRemind'          => User\AfterRemindEvent::class,
+        'onUserBeforeResetRequest'   => User\BeforeResetRequestEvent::class,
+        'onUserAfterResetRequest'    => User\AfterResetRequestEvent::class,
+        'onUserBeforeResetComplete'  => User\BeforeResetCompleteEvent::class,
+        'onUserAfterResetComplete'   => User\AfterResetCompleteEvent::class,
         // User Group
         'onUserBeforeSaveGroup'   => Model\BeforeSaveEvent::class,
         'onUserAfterSaveGroup'    => Model\AfterSaveEvent::class,

libraries/src/Event/User/AbstractResetEvent.php

@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  (C) 2024 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Event\User;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for User reset event.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+abstract class AbstractResetEvent extends UserEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  __DEPLOY_VERSION__
+     * @deprecated __DEPLOY_VERSION__ will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject'];
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   object  $value  The value to set
+     *
+     * @return  object
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function onSetSubject(object $value): object
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the user.
+     *
+     * @return  object
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getUser(): object
+    {
+        return $this->arguments['subject'];
+    }
+}

libraries/src/Event/User/AfterResetCompleteEvent.php

@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  (C) 2024 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Event\User;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for User reset event.
+ * Example:
+ *  new AfterResetCompleteEvent('onEventName', ['subject' => $user]);
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AfterResetCompleteEvent extends AbstractResetEvent
+{
+}

libraries/src/Event/User/AfterResetRequestEvent.php

@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  (C) 2024 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Event\User;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for User reset event.
+ * Example:
+ *  new AfterResetRequestEvent('onEventName', ['subject' => $user]);
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AfterResetRequestEvent extends AbstractResetEvent
+{
+}

libraries/src/Event/User/BeforeResetCompleteEvent.php

@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  (C) 2024 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Event\User;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for User reset event.
+ * Example:
+ *  new BeforeResetCompleteEvent('onEventName', ['subject' => $user]);
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class BeforeResetCompleteEvent extends AbstractResetEvent
+{
+}

libraries/src/Event/User/BeforeResetRequestEvent.php

@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  (C) 2024 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Event\User;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for User reset event.
+ * Example:
+ *  new BeforeResetRequestEvent('onEventName', ['subject' => $user]);
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class BeforeResetRequestEvent extends AbstractResetEvent
+{
+}