use aware trait

joomla · Apr 20, 2023 · 34ac782 · 34ac782
1 parent 2e06b5a
commit 34ac782
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 83 deletions.
diff --git a/plugins/system/actionlogs/services/provider.php b/plugins/system/actionlogs/services/provider.php
@@ -38,10 +38,10 @@ function (Container $container) {
                 $plugin = new ActionLogs(
                     $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('system', 'actionlogs'),
-                    $container->get(UserFactoryInterface::class)
                 );
                 $plugin->setApplication(Factory::getApplication());
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
+                $plugin->setUserFactory($container->get(UserFactoryInterface::class));
 
                 return $plugin;
             }

diff --git a/plugins/system/actionlogs/src/Extension/ActionLogs.php b/plugins/system/actionlogs/src/Extension/ActionLogs.php
@@ -18,7 +18,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Actionlogs\Administrator\Helper\ActionlogsHelper;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\Exception\ExecutionFailureException;
@@ -39,31 +39,20 @@
 final class ActionLogs extends CMSPlugin
 {
     use DatabaseAwareTrait;
-
-    /**
-     * The user factory
-     *
-     * @var   UserFactoryInterface
-     *
-     * @since __DEPLOY_VERSION__
-     */
-    private $userFactory;
+    use UserFactoryAwareTrait;
 
     /**
      * Constructor.
      *
-     * @param   DispatcherInterface   $dispatcher   The dispatcher
-     * @param   array                 $config       An optional associative array of configuration settings
-     * @param   UserFactoryInterface  $userFactory  The user factory
+     * @param   DispatcherInterface  $dispatcher   The dispatcher
+     * @param   array                $config       An optional associative array of configuration settings
      *
      * @since   3.9.0
      */
-    public function __construct(DispatcherInterface $dispatcher, array $config, UserFactoryInterface $userFactory)
+    public function __construct(DispatcherInterface $dispatcher, array $config)
     {
         parent::__construct($dispatcher, $config);
 
-        $this->userFactory = $userFactory;
-
         // Import actionlog plugin group so that these plugins will be triggered for events
         PluginHelper::importPlugin('actionlog');
     }
@@ -127,7 +116,7 @@ public function onContentPrepareForm(Form $form, $data)
             $data = (object) $data;
         }
 
-        if (empty($data->id) || !$this->userFactory->loadUserById($data->id)->authorise('core.admin')) {
+        if (empty($data->id) || !$this->getUserFactory()->loadUserById($data->id)->authorise('core.admin')) {
             return true;
         }
 
@@ -168,7 +157,7 @@ public function onContentPrepareData($context, $data)
             $data = (object) $data;
         }
 
-        if (!$this->userFactory->loadUserById($data->id)->authorise('core.admin')) {
+        if (!$this->getUserFactory()->loadUserById($data->id)->authorise('core.admin')) {
             return true;
         }
 
@@ -348,7 +337,7 @@ public function onUserAfterSave($user, $isNew, $success, $msg): void
         }
 
         // Clear access rights in case user groups were changed.
-        $userObject = $this->userFactory->loadUserById($user['id']);
+        $userObject = $this->getUserFactory()->loadUserById($user['id']);
         $userObject->clearAccessRights();
 
         $authorised = $userObject->authorise('core.admin');

diff --git a/plugins/system/fields/services/provider.php b/plugins/system/fields/services/provider.php
@@ -34,12 +34,13 @@ public function register(Container $container): void
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $plugin = new Fields(
-                    $container->get(DispatcherInterface::class),
+                $dispatcher = $container->get(DispatcherInterface::class),
+                $plugin     = new Fields(
+                    $dispatcher,
                     (array) PluginHelper::getPlugin('system', 'fields'),
-                    $container->get(UserFactoryInterface::class)
                 );
                 $plugin->setApplication(Factory::getApplication());
+                $plugin->setUserFactory($container->get(UserFactoryInterface::class));
 
                 return $plugin;
             }

diff --git a/plugins/system/fields/src/Extension/Fields.php b/plugins/system/fields/src/Extension/Fields.php
@@ -13,9 +13,8 @@
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
-use Joomla\Event\DispatcherInterface;
 use Joomla\Registry\Registry;
 use stdClass;
 
@@ -30,6 +29,8 @@
  */
 final class Fields extends CMSPlugin
 {
+    use UserFactoryAwareTrait;
+
     /**
      * Load the language file on instantiation.
      *
@@ -38,31 +39,6 @@ final class Fields extends CMSPlugin
      */
     protected $autoloadLanguage = true;
 
-    /**
-     * The user factory
-     *
-     * @var   UserFactoryInterface
-     *
-     * @since __DEPLOY_VERSION__
-     */
-    private $userFactory;
-
-    /**
-     * Constructor.
-     *
-     * @param   DispatcherInterface   $dispatcher   The dispatcher
-     * @param   array                 $config       An optional associative array of configuration settings
-     * @param   UserFactoryInterface  $userFactory  The user factory
-     *
-     * @since   __DEPLOY_VERSION__
-     */
-    public function __construct(DispatcherInterface $dispatcher, array $config, UserFactoryInterface $userFactory)
-    {
-        parent::__construct($dispatcher, $config);
-
-        $this->userFactory = $userFactory;
-    }
-
     /**
      * Normalizes the request data.
      *
@@ -202,7 +178,7 @@ public function onUserAfterSave($userData, $isNew, $success, $msg): void
             return;
         }
 
-        $user = $this->userFactory->loadUserById($userData['id']);
+        $user = $this->getUserFactory()->loadUserById($userData['id']);
 
         $task = $this->getApplication()->getInput()->getCmd('task');
 

diff --git a/plugins/system/tasknotification/services/provider.php b/plugins/system/tasknotification/services/provider.php
@@ -35,13 +35,14 @@ public function register(Container $container): void
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $plugin = new TaskNotification(
-                    $container->get(DispatcherInterface::class),
+                $dispatcher = $container->get(DispatcherInterface::class);
+                $plugin     = new TaskNotification(
+                    $dispatcher,
                     (array) PluginHelper::getPlugin('system', 'tasknotification'),
-                    $container->get(UserFactoryInterface::class)
                 );
                 $plugin->setApplication(Factory::getApplication());
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
+                $plugin->setUserFactory($container->get(UserFactoryInterface::class));
 
                 return $plugin;
             }

diff --git a/plugins/system/tasknotification/src/Extension/TaskNotification.php b/plugins/system/tasknotification/src/Extension/TaskNotification.php
@@ -14,15 +14,13 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Form\Form;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Scheduler\Administrator\Task\Status;
 use Joomla\Component\Scheduler\Administrator\Task\Task;
 use Joomla\Database\DatabaseAwareTrait;
-use Joomla\Event\DispatcherInterface;
 use Joomla\Event\Event;
 use Joomla\Event\EventInterface;
 use Joomla\Event\SubscriberInterface;
@@ -47,6 +45,7 @@
 final class TaskNotification extends CMSPlugin implements SubscriberInterface
 {
     use DatabaseAwareTrait;
+    use UserFactoryAwareTrait;
 
     /**
      * The task notification form. This form is merged into the task item form by {@see
@@ -63,15 +62,6 @@ final class TaskNotification extends CMSPlugin implements SubscriberInterface
      */
     protected $autoloadLanguage = true;
 
-    /**
-     * The user factory
-     *
-     * @var   UserFactoryInterface
-     *
-     * @since __DEPLOY_VERSION__
-     */
-    private $userFactory;
-
     /**
      * @inheritDoc
      *
@@ -90,22 +80,6 @@ public static function getSubscribedEvents(): array
         ];
     }
 
-    /**
-     * Constructor.
-     *
-     * @param   DispatcherInterface   $dispatcher   The dispatcher
-     * @param   array                 $config       An optional associative array of configuration settings
-     * @param   UserFactoryInterface  $userFactory  The user factory
-     *
-     * @since   __DEPLOY_VERSION__
-     */
-    public function __construct(DispatcherInterface $dispatcher, array $config, UserFactoryInterface $userFactory)
-    {
-        parent::__construct($dispatcher, $config);
-
-        $this->userFactory = $userFactory;
-    }
-
     /**
      * Inject fields to support configuration of post-execution notifications into the task item form.
      *
@@ -306,7 +280,7 @@ private function sendMail(string $template, array $data, string $attachment = ''
 
         // Mail all matching users who also have the `core.manage` privilege for com_scheduler.
         foreach ($users as $user) {
-            $user = $this->userFactory->loadUserById($user->id);
+            $user = $this->getUserFactory()->loadUserById($user->id);
 
             if ($user->authorise('core.manage', 'com_scheduler')) {
                 try {