Skip to content

fixed check of ambiguous values on Enum::byName() #134

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 5, 2019
Merged

fixed check of ambiguous values on Enum::byName() #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions src/Enum.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,11 @@ final public static function byName(string $name)
throw new InvalidArgumentException("{$const} not defined");
}

assert(
self::noAmbiguousValues(static::getConstants()),
'Ambiguous enumerator values detected for ' . static::class
);

return self::$instances[static::class][$name] = new static(\constant($const));
}

Expand Down
8 changes: 8 additions & 0 deletions tests/MabeEnumTest/EnumTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,14 @@ public function testDisabledAssertAmbiguousEnumeratorValues()
EnumAmbiguous::get('unknown');
}

public function testByNameAmbiguousEnumeratorValues()
{
$this->expectException(AssertionError::class);
$this->expectExceptionMessage('Ambiguous enumerator values detected for ' . EnumAmbiguous::class);

EnumAmbiguous::byName('AMBIGUOUS_INT1');
}

public function testExtendedEnabledAssertAmbiguousEnumeratorValues()
{
$this->expectException(AssertionError::class);
Expand Down