8000 New DSN component by Nyholm · Pull Request #36999 · symfony/symfony · GitHub
[go: up one dir, main page]

Skip to content

New DSN component #36999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
cleanup
  • Loading branch information
Nyholm committed May 29, 2020
commit 11dbd24a67eb873c6a1a531fab24a37bd754204d
8 changes: 4 additions & 4 deletions src/Symfony/Component/Dsn/Configuration/UserPasswordTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ private function getUserInfoString(): string
{
$user = $this->getUser() ?? '';
$password = $this->getPassword() ?? '';
$userInfo = $user.(empty($password) ? '' : ':'.$password).'@';
if (\strlen($userInfo) <= 2) {
$userInfo = '';

if ('' === $password && '' === $user) {
return '';
}

return $userInfo;
return $user.('' === $password ? '' : ':'.$password).'@';
}
}
0