mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-21 00:07:30 +00:00
Code Issues Projects Releases Wiki Activity

Ensure overloaded members can't conflict with static ones and vice versa

Browse Source
This commit is contained in:
Dylan K. Taylor 2025-02-17 01:58:08 +00:00
parent f4f31b654b
commit b1e4e44f77
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/RegistryTrait.php
View File

@ -66,7 +66,7 @@ trait RegistryTrait{
}
self::verifyName($name);
$upperName = mb_strtoupper($name);
if(isset(self::$members[$upperName])){
if(isset(self::$members[$upperName]) || isset(self::$overloadedMembers[$upperName])){
throw new \InvalidArgumentException("\"$upperName\" is already reserved");
}
self::$members[$upperName] = $member;
@ -80,8 +80,8 @@ trait RegistryTrait{
private static function registerOverloaded(string $baseName, string $enumClass, string $returnClass) : void{
self::verifyName($baseName);
$upperName = mb_strtoupper($baseName);
if(isset(self::$overloadedMembers[$upperName])){
throw new \InvalidArgumentException("Overloaded member name \"$upperName\" is already reserved");
if(isset(self::$members[$upperName]) || isset(self::$overloadedMembers[$upperName])){
throw new \InvalidArgumentException("\"$upperName\" is already reserved");
}
$enumToMemberMap = [];
foreach($enumClass::cases() as $case){