system fields

plugins/system/fields/src/Extension/Fields.php

@@ -12,10 +12,12 @@
 
 use Joomla\CMS\Event\Content;
 use Joomla\CMS\Event\Model;
+use Joomla\CMS\Event\User;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
+use Joomla\Event\SubscriberInterface;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -27,10 +29,34 @@
  *
  * @since  3.7
  */
-final class Fields extends CMSPlugin
+final class Fields extends CMSPlugin implements SubscriberInterface
 {
     use UserFactoryAwareTrait;
 
+    /**
+     * Returns an array of events this subscriber will listen to.
+     *
+     * @return array
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            'onContentNormaliseRequestData' => 'onContentNormaliseRequestData',
+            'onContentPrepare'              => 'onContentPrepare',
+            'onContentPrepareForm'          => 'onContentPrepareForm',
+            'onContentAfterSave'            => 'onContentAfterSave',
+            'onContentAfterDelete'          => 'onContentAfterDelete',
+            'onUserAfterSave'               => 'onUserAfterSave',
+            'onUserAfterDelete'             => 'onUserAfterDelete',
+            'onContentAfterTitle'           => 'onContentAfterTitle',
+            'onContentBeforeDisplay'        => 'onContentBeforeDisplay',
+            'onContentAfterDisplay'         => 'onContentAfterDisplay',
+
+        ];
+    }
+
     /**
      * Normalizes the request data.
      *
@@ -80,17 +106,18 @@ public function onContentNormaliseRequestData(Model\NormaliseRequestDataEvent $e
     /**
      * The save event.
      *
-     * @param   string                   $context  The context
-     * @param   \Joomla\CMS\Table\Table  $item     The table
-     * @param   boolean                  $isNew    Is new item
-     * @param   array                    $data     The validated data
+     * @param   Model\AfterSaveEvent  $event  The event object
      *
      * @return  void
      *
      * @since   3.7.0
      */
-    public function onContentAfterSave($context, $item, $isNew, $data = []): void
+    public function onContentAfterSave(Model\AfterSaveEvent $event): void
     {
+        $context = $event->getContext();
+        $item    = $event->getItem();
+        $data    = $event->getData();
+
         // Check if data is an array and the item has an id
         if (!\is_array($data) || empty($item->id) || empty($data['com_fields'])) {
             return;
@@ -155,17 +182,17 @@ public function onContentAfterSave($context, $item, $isNew, $data = []): void
     /**
      * The save event.
      *
-     * @param   array    $userData  The date
-     * @param   boolean  $isNew     Is new
-     * @param   boolean  $success   Is success
-     * @param   string   $msg       The message
+     * @param   User\AfterSaveEvent  $event  The event object
      *
      * @return  void
      *
      * @since   3.7.0
      */
-    public function onUserAfterSave($userData, $isNew, $success, $msg): void
+    public function onUserAfterSave(User\AfterSaveEvent $event): void
     {
+        $userData = $event->getUser();
+        $success  = $event->getSavingResult();
+
         // It is not possible to manipulate the user during save events
         // Check if data is valid or we are in a recursion
         if (!$userData['id'] || !$success) {
@@ -182,21 +209,29 @@ public function onUserAfterSave($userData, $isNew, $success, $msg): void
         }
 
         // Trigger the events with a real user
-        $this->onContentAfterSave('com_users.user', $user, false, $userData);
+        $contentEvent = new Model\AfterSaveEvent('onContentAfterSave', [
+            'context' => 'com_users.user',
+            'subject' => $user,
+            'isNew'   => false,
+            'data'    => $userData,
+        ]);
+        $this->onContentAfterSave($contentEvent);
     }
 
     /**
      * The delete event.
      *
-     * @param   string    $context  The context
-     * @param   \stdClass  $item     The item
+     * @param   Model\AfterDeleteEvent  $event  The event object
      *
      * @return  void
      *
      * @since   3.7.0
      */
-    public function onContentAfterDelete($context, $item): void
+    public function onContentAfterDelete(Model\AfterDeleteEvent $event): void
     {
+        $context = $event->getContext();
+        $item    = $event->getItem();
+
         // Set correct context for category
         if ($context === 'com_categories.category') {
             $context = $item->extension . '.categories';
@@ -219,20 +254,23 @@ public function onContentAfterDelete($context, $item): void
     /**
      * The user delete event.
      *
-     * @param   array     $user    The context
-     * @param   boolean   $success Is success
-     * @param   string    $msg     The message
+     * @param   User\AfterDeleteEvent  $event  The event object
      *
      * @return  void
      *
      * @since   3.7.0
      */
-    public function onUserAfterDelete($user, $success, $msg): void
+    public function onUserAfterDelete(User\AfterDeleteEvent $event): void
     {
+        $user     = $event->getUser();
         $item     = new \stdClass();
         $item->id = $user['id'];
 
-        $this->onContentAfterDelete('com_users.user', $item);
+        $contentEvent = new Model\AfterDeleteEvent('onContentAfterDelete', [
+            'context' => 'com_users.user',
+            'subject' => $user,
+        ]);
+        $this->onContentAfterDelete($contentEvent);
     }
 
     /**