Skip to content

Fix/reduce cognitive complexity and improve exception handling in IsModel #24

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 2 commits into from
Oct 13, 2025
Merged

Fix/reduce cognitive complexity and improve exception handling in IsModel #24

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
763ce62
Fix/reduce cognitive complexity and improve exception handling in IsM…
othercodes Oct 13, 2025
eafc1bb
Add unit tests for HasEquality and HasImmutability traits
othercodes Oct 13, 2025
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
83 changes: 46 additions & 37 deletions src/IsModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
use ReflectionClass;
use ReflectionMethod;
use ReflectionNamedType;
use ReflectionParameter;
use ReflectionUnionType;
use RuntimeException;
use ComplexHeart\Domain\Model\Exceptions\InstantiationException;
use TypeError;

/**
Expand Down Expand Up @@ -51,7 +52,7 @@ final public static function make(mixed ...$params): static
$constructor = $reflection->getConstructor();

if (!$constructor) {
throw new RuntimeException(
throw new InstantiationException(
sprintf('%s must have a constructor to use make()', static::class)
);
}
Expand Down Expand Up @@ -121,46 +122,54 @@ private static function validateConstructorParameters(

// Validate types for each parameter
foreach ($constructorParams as $index => $param) {
if (!isset($params[$index])) {
continue; // Optional parameter not provided
if (isset($params[$index])) {
self::validateParameterType($param, $params[$index]);
}
}
}

$value = $params[$index];
$type = $param->getType();

if ($type === null) {
continue; // No type hint
}
/**
* Validate a single parameter's type.
*
* @param ReflectionParameter $param
* @param mixed $value
* @return void
* @throws TypeError
*/
private static function validateParameterType(ReflectionParameter $param, mixed $value): void
{
$type = $param->getType();

$isValid = false;
$expectedTypes = '';

if ($type instanceof ReflectionNamedType) {
// Single type
$isValid = self::validateType($value, $type->getName(), $type->allowsNull());
$expectedTypes = $type->getName();
} elseif ($type instanceof ReflectionUnionType) {
// Union type (e.g., int|float|string)
$isValid = self::validateUnionType($value, $type);
$expectedTypes = implode('|', array_map(
fn ($t) => $t instanceof ReflectionNamedType ? $t->getName() : 'mixed',
$type->getTypes()
));
} else {
continue; // Intersection types or other complex types not supported yet
}
if ($type === null) {
return; // No type hint
}

if (!$isValid) {
throw new TypeError(
sprintf(
'%s::make() parameter "%s" must be of type %s, %s given',
basename(str_replace('\\', '/', static::class)),
$param->getName(),
$expectedTypes,
get_debug_type($value)
)
);
}
if ($type instanceof ReflectionNamedType) {
// Single type
$isValid = self::validateType($value, $type->getName(), $type->allowsNull());
$expectedTypes = $type->getName();
} elseif ($type instanceof ReflectionUnionType) {
// Union type (e.g., int|float|string)
$isValid = self::validateUnionType($value, $type);
$expectedTypes = implode('|', array_map(
fn ($t) => $t instanceof ReflectionNamedType ? $t->getName() : 'mixed',
$type->getTypes()
));
} else {
return; // Intersection types or other complex types not supported yet
}

if (!$isValid) {
throw new TypeError(
sprintf(
'%s::make() parameter "%s" must be of type %s, %s given',
basename(str_replace('\\', '/', static::class)),
$param->getName(),
$expectedTypes,
get_debug_type($value)
)
);
}
}

Expand Down