Skip to content

Correctly handle explicit array types #13

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
DerManoMann merged 1 commit into from
Feb 15, 2026
Merged

Correctly handle explicit array types #13

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
9 changes: 9 additions & 0 deletions src/Type/ExplicitType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Radebatz\TypeInfoExtras\Type;

use Symfony\Component\TypeInfo\Type;
use Symfony\Component\TypeInfo\Type\BuiltinType;
use Symfony\Component\TypeInfo\TypeIdentifier;

/**
Expand Down Expand Up @@ -31,6 +32,14 @@ public function getTypeIdentifier(): TypeIdentifier
return $this->typeIdentifier;
}

/**
* Get the underlying builtin type.
*/
public function getBuiltinType(): BuiltinType
{
return Type::builtin($this->typeIdentifier);
}

public function getExplicitType(): string
{
return $this->explicitType;
Expand Down
7 changes: 7 additions & 0 deletions src/TypeResolver/ResolverExtrasTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,11 @@ protected function tryAsClassLike(BaseType $type, array $variableTypes): ?ClassL

return null;
}

public function reduceToBuiltinType(?BaseType $type)
{
return $type instanceof ExplicitType
? $type->getBuiltinType()
: $type;
}
}
2 changes: 1 addition & 1 deletion src/TypeResolver/StringTypeResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ private function getTypeFromNode(TypeNode $node, ?TypeContext $typeContext): Bas
throw new \DomainException(\sprintf('"%s" type cannot have a key type defined.', $node->type));
}

return Type::collection($type, $variableTypes[1], $variableTypes[0], $asList);
return Type::collection($type, $variableTypes[1], $this->reduceToBuiltinType($variableTypes[0]), $asList);
}
}

Expand Down
1 change: 1 addition & 0 deletions tests/TypeResolver/StringTypeResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public static function extrasResolveDataProvider(): iterable
yield [Type::union(Type::intRange(to: -1), Type::intRange(from: 1)), 'non-zero-int'];
yield [Type::intRange(0, 100), 'int<0, 100>'];
yield [Type::intRange(), 'int<min, max>'];
yield [Type::array(Type::bool(), Type::int()), 'array<positive-int, bool>'];

yield [Type::explicit(TypeIdentifier::STRING, 'class-string'), 'class-string'];
yield [Type::classLike('class-string', Type::object(Dummy::class)), sprintf('class-string<%s>', Dummy::class)];
Expand Down