switch getUsername to getAccountName for d9 compatibility (#4325)

hechoendrupal · Sep 15, 2022 · 60c4cf9 · 60c4cf9
1 parent c9f1763
commit 60c4cf9
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/src/Command/Database/DatabaseLogBase.php b/src/Command/Database/DatabaseLogBase.php
@@ -218,7 +218,7 @@ protected function createTableRow(\stdClass $dblog)
          */
         if ($user = $this->userStorage->load($dblog->uid)) {
             $user_id = $user->id();
-            $user_name = $user->getUsername();
+            $user_name = $user->getAccountName();
         } else {
             $user_id = $dblog->uid;
             $user_name = $this->trans('commands.database.log.common.messages.user-deleted');

diff --git a/src/Command/Debug/UserCommand.php b/src/Command/Debug/UserCommand.php
@@ -157,7 +157,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $status = $user->isActive()?$this->trans('commands.common.status.enabled'):$this->trans('commands.common.status.disabled');
             $tableRows[] = [
                 $userId,
-                $user->getUsername(),
+                $user->getAccountName(),
                 implode(', ', $userRoles),
                 $status
             ];

diff --git a/src/Command/User/CreateCommand.php b/src/Command/User/CreateCommand.php
@@ -246,7 +246,7 @@ private function createUser($username, $password, $roles, $email = null, $status
 
             $result['success'] = [
                 'user-id' => $user->id(),
-                'username' => $user->getUsername(),
+                'username' => $user->getAccountName(),
                 'password' => $password,
                 'email' => $user->getEmail(),
                 'roles' => implode(', ', $roles),

diff --git a/src/Command/User/DeleteCommand.php b/src/Command/User/DeleteCommand.php
@@ -126,7 +126,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $this->getIo()->info(
                     sprintf(
                         $this->trans('commands.user.delete.messages.user-deleted'),
-                        $userEntity->getUsername()
+                        $userEntity->getAccountName()
                     )
                 );
 
@@ -161,9 +161,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
             foreach ($users as $user => $userEntity) {
                 try {
                     $userEntity->delete();
-                    $tableRows['success'][] = [$user, $userEntity->getUsername()];
+                    $tableRows['success'][] = [$user, $userEntity->getAccountName()];
                 } catch (\Exception $e) {
-                    $tableRows['error'][] = [$user, $userEntity->getUsername()];
+                    $tableRows['error'][] = [$user, $userEntity->getAccountName()];
                     $this->getIo()->error($e->getMessage());
 
                     return 1;

diff --git a/src/Command/User/LoginCleanAttemptsCommand.php b/src/Command/User/LoginCleanAttemptsCommand.php
@@ -107,7 +107,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->getIo()->success(
             sprintf(
                 $this->trans('commands.user.login.clear.attempts.messages.successful'),
-                $userEntity->getUsername()
+                $userEntity->getAccountName()
             )
         );
     }

diff --git a/src/Command/User/LoginUrlCommand.php b/src/Command/User/LoginUrlCommand.php
@@ -103,7 +103,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->getIo()->success(
             sprintf(
                 $this->trans('commands.user.login.url.messages.url'),
-                $userEntity->getUsername()
+                $userEntity->getAccountName()
             )
         );
 

diff --git a/src/Command/User/UserBase.php b/src/Command/User/UserBase.php
@@ -61,7 +61,7 @@ public function getUsers()
 
         $userList = [];
         foreach ($users as $userId => $user) {
-            $userList[$userId] = $user->getUsername();
+            $userList[$userId] = $user->getAccountName();
         }
 
         return $userList;

diff --git a/src/Utils/Create/UserData.php b/src/Utils/Create/UserData.php
@@ -62,7 +62,7 @@ public function create(
 
                 $users['success'][] = [
                     'user-id' => $user->id(),
-                    'username' => $user->getUsername(),
+                    'username' => $user->getAccountName(),
                     'roles' => implode(', ', $userRoles),
                     'created' => $this->dateFormatter->format(
                         $user->getCreatedTime(),