Make the current user available in form fields (#40425)

* Make the current user available in form fields

* test

Author: laoneo

administrator/components/com_categories/src/Field/CategoryeditField.php

@@ -170,7 +170,7 @@ protected function getOptions()
             : (int) $oldCat;
 
         $db   = $this->getDatabase();
-        $user = Factory::getUser();
+        $user = $this->getCurrentUser();
 
         $query = $db->getQuery(true)
             ->select(

administrator/components/com_fields/src/Field/FieldgroupsField.php

@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Fields\Administrator\Field;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\Utilities\ArrayHelper;
 
@@ -43,7 +42,7 @@ protected function getOptions()
         $states    = $this->element['state'] ?: '0,1';
         $states    = ArrayHelper::toInteger(explode(',', $states));
 
-        $user       = Factory::getUser();
+        $user       = $this->getCurrentUser();
         $viewlevels = ArrayHelper::toInteger($user->getAuthorisedViewLevels());
 
         $db    = $this->getDatabase();

administrator/components/com_messages/src/Field/UserMessagesField.php

@@ -84,6 +84,6 @@ protected function getGroups()
      */
     protected function getExcluded()
     {
-        return [Factory::getUser()->id];
+        return [$this->getCurrentUser()->id];
     }
 }

administrator/components/com_users/src/Field/GroupparentField.php

@@ -81,7 +81,7 @@ protected function getOptions()
         }
 
         $options      = array_values($options);
-        $isSuperAdmin = Factory::getUser()->authorise('core.admin');
+        $isSuperAdmin = $this->getCurrentUser()->authorise('core.admin');
 
         // Pad the option text with spaces using depth level as a multiplier.
         for ($i = 0, $n = count($options); $i < $n; $i++) {

libraries/src/Form/Field/CategoryField.php

@@ -9,7 +9,6 @@
 
 namespace Joomla\CMS\Form\Field;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
@@ -74,7 +73,7 @@ protected function getOptions()
             // Verify permissions.  If the action attribute is set, then we scan the options.
             if ((string) $this->element['action']) {
                 // Get the current user object.
-                $user = Factory::getUser();
+                $user = $this->getCurrentUser();
 
                 foreach ($options as $i => $option) {
                     /*

libraries/src/Form/Field/FrontendlanguageField.php

@@ -64,7 +64,7 @@ protected function getOptions()
         } catch (\RuntimeException $e) {
             $languages = [];
 
-            if (Factory::getUser()->authorise('core.admin')) {
+            if ($this->getCurrentUser()->authorise('core.admin')) {
                 Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
             }
         }

libraries/src/Form/Field/MenuField.php

@@ -9,7 +9,6 @@
 
 namespace Joomla\CMS\Form\Field;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\Database\ParameterType;
 
@@ -73,7 +72,7 @@ protected function getGroups()
         $menus = $db->setQuery($query)->loadObjectList();
 
         if ($accessType) {
-            $user = Factory::getUser();
+            $user = $this->getCurrentUser();
 
             foreach ($menus as $key => $menu) {
                 switch ($accessType) {

libraries/src/Form/Field/PluginsField.php

@@ -148,7 +148,7 @@ protected function getOptions()
             );
 
         if ((string) $this->element['useaccess'] === 'true') {
-            $query->whereIn($db->quoteName('access'), Factory::getUser()->getAuthorisedViewLevels());
+            $query->whereIn($db->quoteName('access'), $this->getCurrentUser()->getAuthorisedViewLevels());
         }
 
         $options   = $db->setQuery($query)->loadObjectList();

libraries/src/Form/Field/TagField.php

@@ -315,7 +315,7 @@ public function allowCustom()
             return false;
         }
 
-        return Factory::getUser()->authorise('core.create', 'com_tags');
+        return $this->getCurrentUser()->authorise('core.create', 'com_tags');
     }
 
     /**

libraries/src/Form/Field/TransitionField.php

@@ -135,7 +135,7 @@ protected function getGroups()
         $component = reset($parts);
 
         if (\count($items)) {
-            $user = Factory::getUser();
+            $user = $this->getCurrentUser();
 
             $items = array_filter(
                 $items,