RegistryTrait: avoid overwriting parameter variables

This commit is contained in:
Dylan K. Taylor 2022-01-06 23:54:54 +00:00
parent fb29653ed7
commit 4f8a0bad25
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D

View File

@ -37,11 +37,11 @@ trait RegistryTrait{
* @throws \InvalidArgumentException
*/
private static function _registryRegister(string $name, object $member) : void{
$name = mb_strtoupper($name);
if(isset(self::$members[$name])){
throw new \InvalidArgumentException("\"$name\" is already reserved");
$upperName = mb_strtoupper($name);
if(isset(self::$members[$upperName])){
throw new \InvalidArgumentException("\"$upperName\" is already reserved");
}
self::$members[mb_strtoupper($name)] = $member;
self::$members[$upperName] = $member;
}
/**
@ -68,11 +68,11 @@ trait RegistryTrait{
*/
private static function _registryFromString(string $name) : object{
self::checkInit();
$name = mb_strtoupper($name);
if(!isset(self::$members[$name])){
throw new \InvalidArgumentException("No such registry member: " . self::class . "::" . $name);
$upperName = mb_strtoupper($name);
if(!isset(self::$members[$upperName])){
throw new \InvalidArgumentException("No such registry member: " . self::class . "::" . $upperName);
}
return self::preprocessMember(self::$members[$name]);
return self::preprocessMember(self::$members[$upperName]);
}
protected static function preprocessMember(object $member) : object{