Skip to content

Commit 11f2503

Browse files
committed
Internal: API: Unify serialization groups for User::$fullName - refs BT#22928
1 parent 02d96b3 commit 11f2503

23 files changed

+30
-29
lines changed

public/main/inc/lib/AnnouncementManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public static function parseContent(
9797

9898
$session->getGeneralCoaches()
9999
->forAll(function (int $key, User $user) use (&$generalCoachName, &$generalCoachEmail) {
100-
$generalCoachName .= $user->getFullname().PHP_EOL;
100+
$generalCoachName .= $user->getFullName().PHP_EOL;
101101
$generalCoachEmail .= $user->getEmail().PHP_EOL;
102102

103103
return true;

public/main/inc/lib/CoursesAndSessionsCatalog.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1659,7 +1659,7 @@ public static function getFormattedSessionsBlock(array $sessions)
16591659
'id' => $coach->getId(),
16601660
'url' => api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?'
16611661
.http_build_query(['a' => 'get_user_popup', 'user_id' => $coach->getId()]),
1662-
'name' => $coach->getFullname(),
1662+
'name' => $coach->getFullName(),
16631663
'avatar' => UserManager::getUserPicture($coach->getId(), USER_IMAGE_SIZE_SMALL),
16641664
]
16651665
),

public/main/inc/lib/ScheduledAnnouncement.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ public function sendPendingMessages($urlId = 0)
384384
$generalCoachEmail = [];
385385
/** @var User $generalCoach */
386386
foreach ($generalCoaches as $generalCoach) {
387-
$generalCoachName[] = $generalCoach->getFullname();
387+
$generalCoachName[] = $generalCoach->getFullName();
388388
$generalCoachEmail[] = $generalCoach->getEmail();
389389
}
390390

public/main/inc/lib/TicketManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1426,7 +1426,7 @@ public static function sendNotification($ticketId, $title, $message, $onlyToUser
14261426
self::isUserSubscribedToTicket($ticketId, $follower->getId())
14271427
)
14281428
) {
1429-
$recipients[$follower->getId()] = $follower->getFullname();
1429+
$recipients[$follower->getId()] = $follower->getFullName();
14301430
}
14311431
}
14321432
}

public/main/inc/lib/sessionmanager.lib.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2405,7 +2405,7 @@ public static function notifyBossOfInscription(User $boss, Session $session, int
24052405
'@ChamiloCore/Mailer/Legacy/subject_subscription_to_boss_notification.html.twig',
24062406
[
24072407
'locale' => $boss->getLocale(),
2408-
'boss_name' => $boss->getFullname(),
2408+
'boss_name' => $boss->getFullName(),
24092409
'student_name' => $user_info['complete_name'],
24102410
'session_name' => $session->getTitle(),
24112411
]
@@ -2415,15 +2415,15 @@ public static function notifyBossOfInscription(User $boss, Session $session, int
24152415
'@ChamiloCore/Mailer/Legacy/content_subscription_to_boss_notification.html.twig',
24162416
[
24172417
'locale' => $boss->getLocale(),
2418-
'boss_name' => $boss->getFullname(),
2418+
'boss_name' => $boss->getFullName(),
24192419
'student_name' => $user_info['complete_name'],
24202420
'session_name' => $session->getTitle(),
24212421
]
24222422
);
24232423

24242424
// Send email
24252425
api_mail_html(
2426-
$boss->getFullname(),
2426+
$boss->getFullName(),
24272427
$boss->getEmail(),
24282428
$subject,
24292429
$content,
@@ -10632,7 +10632,7 @@ public static function getGeneralCoachesNamesForSession(int $sessionId): array
1063210632
{
1063310633
return api_get_session_entity($sessionId)
1063410634
->getGeneralCoaches()
10635-
->map(fn(User $user) => $user->getFullname())
10635+
->map(fn(User $user) => $user->getFullName())
1063610636
->getValues();
1063710637
}
1063810638

public/plugin/BuyCourses/src/buy_course_plugin.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ public function getCatalogSessionList($start, $end, $name = null, $min = 0, $max
625625
}
626626

627627
$sessionData = $this->getSessionInfo($session->getId());
628-
$sessionData['coaches'] = $session->getGeneralCoaches()->map(fn(User $coach) => $coach->getFullname());
628+
$sessionData['coaches'] = $session->getGeneralCoaches()->map(fn(User $coach) => $coach->getFullName());
629629
$sessionData['enrolled'] = $this->getUserStatusForSession(
630630
api_get_user_id(),
631631
$session

public/plugin/BuyCourses/src/configure_course.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112

113113
foreach ($generalCoaches as $generalCoach) {
114114
$generalCoachesOptions[] = [
115-
'text' => $generalCoach->getFullname(),
115+
'text' => $generalCoach->getFullName(),
116116
'value' => $generalCoach->getId(),
117117
];
118118
$defaultBeneficiaries[] = $generalCoach->getId();

public/plugin/ImsLti/auth.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111

112112
// User info
113113
if ($tool->isSharingName()) {
114-
$jwtContent['name'] = $user->getFullname();
114+
$jwtContent['name'] = $user->getFullName();
115115
$jwtContent['given_name'] = $user->getFirstname();
116116
$jwtContent['family_name'] = $user->getLastname();
117117
}

public/plugin/ImsLti/src/ImsLti.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public static function getSubstitutableVariables(
4343
'$Person.sourcedId' => $isLti1p3
4444
? self::getPersonSourcedId($domain, $user)
4545
: "$domain:".ImsLtiPlugin::getLaunchUserIdClaim($tool, $user),
46-
'$Person.name.full' => $user->getFullname(),
46+
'$Person.name.full' => $user->getFullName(),
4747
'$Person.name.family' => $user->getLastname(),
4848
'$Person.name.given' => $user->getFirstname(),
4949
'$Person.address.street1' => $user->getAddress(),

public/plugin/Zoom/Entity/Meeting.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ public function getIntroduction(): string
423423
}
424424
}
425425
if ($this->user) {
426-
$introduction .= sprintf('<p>%s</p>', $this->user->getFullname());
426+
$introduction .= sprintf('<p>%s</p>', $this->user->getFullName());
427427
} elseif ($this->isCourseMeeting()) {
428428
if (null === $this->session) {
429429
$introduction .= sprintf('<p class="main">%s</p>', $this->course);

0 commit comments

Comments
 (0)