Refactor class User - use NULL-object pattern for guests and temporary users, create UserService

16 files changed, 32 insertions, 32 deletions

diff --git a/resources/views/emails/approve-user-html.phtml b/resources/views/emails/approve-user-html.phtml
index ed1734defc..937f9b743a 100644
--- a/resources/views/emails/approve-user-html.phtml
+++ b/resources/views/emails/approve-user-html.phtml
@@ -1,6 +1,6 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
 <p>
-    <?= I18N::translate('Hello %s…', e($user->getRealName())) ?>
+    <?= I18N::translate('Hello %s…', e($user->realName())) ?>
 </p>
 
 <p>
diff --git a/resources/views/emails/approve-user-text.phtml b/resources/views/emails/approve-user-text.phtml
index b2c17e4abb..59df11dd0f 100644
--- a/resources/views/emails/approve-user-text.phtml
+++ b/resources/views/emails/approve-user-text.phtml
@@ -1,4 +1,4 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
-?= I18N::translate('Hello %s…', e($user->getRealName())) ?>
+?= I18N::translate('Hello %s…', e($user->realName())) ?>
 
 <?= I18N::translate('The administrator at the webtrees site %s has approved your application for an account. You may now sign in by accessing the following link: %s', $site_url, $site_url) ?>
diff --git a/resources/views/emails/message-copy-html.phtml b/resources/views/emails/message-copy-html.phtml
index 2bfe509a24..e568e6c1b6 100644
--- a/resources/views/emails/message-copy-html.phtml
+++ b/resources/views/emails/message-copy-html.phtml
@@ -1,10 +1,10 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
 <p>
-    <?= I18N::translate('Hello %s…', e($sender->getRealName())) ?>
+    <?= I18N::translate('Hello %s…', e($sender->realName())) ?>
 </p>
 
 <p>
-    <?= I18N::translate('You sent the following message to a webtrees user:') ?><?= e($recipient->getRealName()) ?>
+    <?= I18N::translate('You sent the following message to a webtrees user:') ?><?= e($recipient->realName()) ?>
 </p>
 
 <hr>
diff --git a/resources/views/emails/message-copy-text.phtml b/resources/views/emails/message-copy-text.phtml
index 41512a4280..1fd488877b 100644
--- a/resources/views/emails/message-copy-text.phtml
+++ b/resources/views/emails/message-copy-text.phtml
@@ -1,7 +1,7 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
-<?= I18N::translate('Hello %s…', $sender->getRealName()) ?>
+<?= I18N::translate('Hello %s…', $sender->realName()) ?>
 
-<?= I18N::translate('You sent the following message to a webtrees user:') ?><?= $recipient->getRealName() ?>
+<?= I18N::translate('You sent the following message to a webtrees user:') ?><?= $recipient->realName() ?>
 
 ------------------------------------------------------------
 <?= $message ?>
diff --git a/resources/views/emails/message-user-html.phtml b/resources/views/emails/message-user-html.phtml
index 8838fe9fc4..eb9277e33d 100644
--- a/resources/views/emails/message-user-html.phtml
+++ b/resources/views/emails/message-user-html.phtml
@@ -1,10 +1,10 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
 <p>
-    <?= I18N::translate('Hello %s…', e($recipient->getRealName())) ?>
+    <?= I18N::translate('Hello %s…', e($recipient->realName())) ?>
 </p>
 
 <p>
-    <?= /* I18N: %s is a person's name */ I18N::translate('%s sent you the following message.', e($sender->getRealName())) ?>
+    <?= /* I18N: %s is a person's name */ I18N::translate('%s sent you the following message.', e($sender->realName())) ?>
 </p>
 
 <hr>
diff --git a/resources/views/emails/message-user-text.phtml b/resources/views/emails/message-user-text.phtml
index b60de79809..2a16be4a29 100644
--- a/resources/views/emails/message-user-text.phtml
+++ b/resources/views/emails/message-user-text.phtml
@@ -1,7 +1,7 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
-<?= I18N::translate('Hello %s…', $recipient->getRealName()) ?>
+<?= I18N::translate('Hello %s…', $recipient->realName()) ?>
 
-<?= /* I18N: %s is a person's name */ I18N::translate('%s sent you the following message.', $sender->getRealName()) ?>
+<?= /* I18N: %s is a person's name */ I18N::translate('%s sent you the following message.', $sender->realName()) ?>
 
 ------------------------------------------------------------
 <?= $message ?>
diff --git a/resources/views/emails/password-reset-html.phtml b/resources/views/emails/password-reset-html.phtml
index 2a28cdd40e..6e1703ec38 100644
--- a/resources/views/emails/password-reset-html.phtml
+++ b/resources/views/emails/password-reset-html.phtml
@@ -1,6 +1,6 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
 <p>
-    <?= e(I18N::translate('Hello %s…', $user->getRealName())) ?>
+    <?= e(I18N::translate('Hello %s…', $user->realName())) ?>
 </p>
 
 <p>
@@ -15,7 +15,7 @@
 </dl>
 
 <p>
-    <a href="<?= e(route('login', ['username' => $user->getUserName(), 'url' => route('my-account', [])], true)) ?>">
+    <a href="<?= e(route('login', ['username' => $user->userName(), 'url' => route('my-account', [])], true)) ?>">
         <?= I18N::translate('Sign in') ?>
     </a>
 </p>
diff --git a/resources/views/emails/password-reset-text.phtml b/resources/views/emails/password-reset-text.phtml
index 6540f9299f..40c23e36c9 100644
--- a/resources/views/emails/password-reset-text.phtml
+++ b/resources/views/emails/password-reset-text.phtml
@@ -1,11 +1,11 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
-<?= I18N::translate('Hello %s…', $user->getRealName()) ?>
+<?= I18N::translate('Hello %s…', $user->realName()) ?>
 
 <?= I18N::translate('A new password has been requested for your username.') ?>
 
-<?= I18N::translate('Username') ?> - <?= $user->getUserName()?>
+<?= I18N::translate('Username') ?> - <?= $user->userName()?>
 <?= I18N::translate('Password') ?> - <?= $new_password ?>
 
-<?= I18N::translate('Sign in') ?> - <?= route('login', ['username' => $user->getUserName(), 'url' => route('my-account', [])], true) ?>
+<?= I18N::translate('Sign in') ?> - <?= route('login', ['username' => $user->userName(), 'url' => route('my-account', [])], true) ?>
 
 <?= I18N::translate('After you have signed in, select the “My account” link under the “My pages” menu and fill in the password fields to change your password.') ?>
diff --git a/resources/views/emails/pending-changes-html.phtml b/resources/views/emails/pending-changes-html.phtml
index b5f7ae7893..f8b21bc834 100644
--- a/resources/views/emails/pending-changes-html.phtml
+++ b/resources/views/emails/pending-changes-html.phtml
@@ -1,6 +1,6 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
 <p>
-    <?= e(I18N::translate('Hello %s…', $user->getRealName())) ?>
+    <?= e(I18N::translate('Hello %s…', $user->realName())) ?>
 </p>
 
 <p>
diff --git a/resources/views/emails/pending-changes-text.phtml b/resources/views/emails/pending-changes-text.phtml
index 528d02a235..81f2ca1aa7 100644
--- a/resources/views/emails/pending-changes-text.phtml
+++ b/resources/views/emails/pending-changes-text.phtml
@@ -1,6 +1,6 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
 
-<?= I18N::translate('Hello %s…', $user->getRealName()) ?>
+<?= I18N::translate('Hello %s…', $user->realName()) ?>
 
 <?= I18N::translate('There are pending changes for you to moderate.') ?>
 
diff --git a/resources/views/emails/register-notify-html.phtml b/resources/views/emails/register-notify-html.phtml
index b47c5d8c52..28365f29cd 100644
--- a/resources/views/emails/register-notify-html.phtml
+++ b/resources/views/emails/register-notify-html.phtml
@@ -11,9 +11,9 @@
     <dt><?= I18N::translate('Username') ?></dt>
     <dd><?= e($user->getUserName()) ?></dd>
     <dt><?= I18N::translate('Real name') ?></dt>
-    <dd><?= e($user->getRealName()) ?></dd>
+    <dd><?= e($user->realName()) ?></dd>
     <dt><?= I18N::translate('Email address') ?></dt>
-    <dd><?= e($user->getEmail()) ?></dd>
+    <dd><?= e($user->email()) ?></dd>
     <dt><?= I18N::translate('Comments') ?></dt>
     <dd><?= e($comments) ?></dd>
 </dl>
diff --git a/resources/views/emails/register-notify-text.phtml b/resources/views/emails/register-notify-text.phtml
index ca61b18c34..908bccacff 100644
--- a/resources/views/emails/register-notify-text.phtml
+++ b/resources/views/emails/register-notify-text.phtml
@@ -4,8 +4,8 @@
 <?= /* I18N: %s is a server name/URL */I18N::translate('A prospective user has registered with webtrees at %s.', WT_BASE_URL . ' ' . e($tree->title())) ?>
 
 <?= I18N::translate('Username') ?> - <?= e($user->getUserName()) ?>
-<?= I18N::translate('Real name') ?> - <?= e($user->getRealName()) ?>
-<?= I18N::translate('Email address') ?> - <?= e($user->getEmail()) ?>
+<?= I18N::translate('Real name') ?> - <?= e($user->realName()) ?>
+<?= I18N::translate('Email address') ?> - <?= e($user->email()) ?>
 <?= I18N::translate('Comments') ?> - <?= e($comments) ?>
 
 <?= I18N::translate('The user has been sent an email with the information necessary to confirm the access request.') ?>
diff --git a/resources/views/emails/register-user-html.phtml b/resources/views/emails/register-user-html.phtml
index 5ded2c974f..af2ea25135 100644
--- a/resources/views/emails/register-user-html.phtml
+++ b/resources/views/emails/register-user-html.phtml
@@ -1,10 +1,10 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
 <p>
-    <?= I18N::translate('Hello %s…', e($user->getRealName())) ?>
+    <?= I18N::translate('Hello %s…', e($user->realName())) ?>
 </p>
 
 <p>
-    <?= /* I18N: %1$s is the site URL and %2$s is an email address */I18N::translate('You (or someone claiming to be you) has requested an account at %1$s using the email address %2$s.', e(WT_BASE_URL), e($user->getEmail())) ?>
+    <?= /* I18N: %1$s is the site URL and %2$s is an email address */I18N::translate('You (or someone claiming to be you) has requested an account at %1$s using the email address %2$s.', e(WT_BASE_URL), e($user->email())) ?>
 </p>
 
 <p>
@@ -12,8 +12,8 @@
 </p>
 
 <p>
-    <a href="<?= e(route('verify', ['username' => $user->getUserName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->name()], true)) ?>">
-        <?= e(route('verify', ['username' => $user->getUserName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->name()], true)) ?>
+    <a href="<?= e(route('verify', ['username' => $user->userName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->name()], true)) ?>">
+        <?= e(route('verify', ['username' => $user->userName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->name()], true)) ?>
     </a>
 </p>
 
diff --git a/resources/views/emails/register-user-text.phtml b/resources/views/emails/register-user-text.phtml
index 3018919818..1a78861f1a 100644
--- a/resources/views/emails/register-user-text.phtml
+++ b/resources/views/emails/register-user-text.phtml
@@ -1,10 +1,10 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
-<?= I18N::translate('Hello %s…', e($user->getRealName())) ?>
+<?= I18N::translate('Hello %s…', e($user->realName())) ?>
 
-<?= /* I18N: %1$s is the site URL and %2$s is an email address */I18N::translate('You (or someone claiming to be you) has requested an account at %1$s using the email address %2$s.', e(WT_BASE_URL), e($user->getEmail())) ?>
+<?= /* I18N: %1$s is the site URL and %2$s is an email address */I18N::translate('You (or someone claiming to be you) has requested an account at %1$s using the email address %2$s.', e(WT_BASE_URL), e($user->email())) ?>
 
 <?= I18N::translate('Follow this link to verify your email address.') ?>
 
-<?= route('verify', ['username' => $user->getUserName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->name()], true) ?>
+<?= route('verify', ['username' => $user->userName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->name()], true) ?>
 
 <?= I18N::translate('If you didn’t request an account, you can just delete this message.');
diff --git a/resources/views/emails/verify-notify-html.phtml b/resources/views/emails/verify-notify-html.phtml
index 9767a81538..c2d6380563 100644
--- a/resources/views/emails/verify-notify-html.phtml
+++ b/resources/views/emails/verify-notify-html.phtml
@@ -6,9 +6,9 @@
 <p>
     <?= /* I18N: %1$s is a real-name, %2$s is a username, %3$s is an email address */ I18N::translate(
         'A new user (%1$s) has requested an account (%2$s) and verified an email address (%3$s).',
-        e($user->getRealName()),
+        e($user->realName()),
         e($user->getUserName()),
-        e($user->getEmail())
+        e($user->email())
     ) ?>
 </p>
 
diff --git a/resources/views/emails/verify-notify-text.phtml b/resources/views/emails/verify-notify-text.phtml
index c9affb9bea..8018d9121d 100644
--- a/resources/views/emails/verify-notify-text.phtml
+++ b/resources/views/emails/verify-notify-text.phtml
@@ -3,9 +3,9 @@
 
 <?= /* I18N: %1$s is a real-name, %2$s is a username, %3$s is an email address */ I18N::translate(
     'A new user (%1$s) has requested an account (%2$s) and verified an email address (%3$s).',
-    e($user->getRealName()),
+    e($user->realName()),
     e($user->getUserName()),
-    e($user->getEmail())
+    e($user->email())
 ) ?>
 
 <?= I18N::translate('You need to review the account details.') ?>