mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-21 01:25:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't add strange looking space in full name if a user does not have an first or last name.

Browse source
This commit is contained in:
Jan Böhmer 2020-04-08 16:18:53 +02:00
parent 0b16fd7697
commit 919e40e1a8
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Entity/UserSystem/User.php
View file

@ -506,11 +506,18 @@ class User extends AttachmentContainingDBElement implements UserInterface, HasPe
*/
public function getFullName(bool $including_username = false): string
{
$tmp = $this->getFirstName();
//Dont add a space, if the name has only one part (it would look strange)
if (!empty($this->getFirstName()) && !empty($this->getLastName())) {
$tmp .= ' ';
}
$tmp .= $this->getLastName();
if ($including_username) {
return sprintf('%s %s (@%s)', $this->getFirstName(), $this->getLastName(), $this->getName());
$tmp .= sprintf(' (@%s)', $this->getName());
}
return sprintf('%s %s', $this->getFirstName(), $this->getLastName());
return $tmp;
}
/**

3
tests/Entity/UserSystem/UserTest.php
View file

@ -58,6 +58,9 @@ class UserTest extends TestCase
$this->assertSame('John Doe', $user->getFullName(false));
$this->assertSame('John Doe (@username)', $user->getFullName(true));
$user->setLastName('');
$this->assertSame('John (@username)', $user->getFullName(true));
}
public function googleAuthenticatorEnabledDataProvider(): array