Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "UserFactory: Simplify and type hint newAnonymous"

Browse source
This commit is contained in:
jenkins-bot 2021-08-18 00:16:42 +00:00 committed by Gerrit Code Review
commit 48a3b2e7f8
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
includes/user/UserFactory.php
View file

@ -109,14 +109,12 @@ class UserFactory implements IDBAccessObject, UserRigorOptions {
* @param string|null $ip IP address * @param string|null $ip IP address
* @return User * @return User
*/ */
public function newAnonymous( $ip = null ): User { public function newAnonymous( ?string $ip = null ): User {
if ( $ip ) { if ( $ip ) {
$validIp = $this->userNameUtils->isIP( $ip ); if ( !$this->userNameUtils->isIP( $ip ) ) {
if ( $validIp ) {
$user = $this->newFromName( $ip, self::RIGOR_NONE );
} else {
throw new InvalidArgumentException( 'Invalid IP address' ); throw new InvalidArgumentException( 'Invalid IP address' );
} }
$user = $this->newFromName( $ip, self::RIGOR_NONE );
} else { } else {
$user = new User(); $user = new User();
} }