-
-
Notifications
You must be signed in to change notification settings - Fork 71
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.
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
Improve error messages for shape and vec -like types #429
Closed
vrielsa
wants to merge
1
commit into
azjezz:next
from
vrielsa:improve-error-messages-for-shape-and-vec-types
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -58,19 +58,21 @@ public function coerce(mixed $value): iterable | |
throw CoercionException::withValue($value, $this->toString(), $this->getTrace()); | ||
} | ||
|
||
/** @var Type\Type<Tv> $value_type */ | ||
$value_type = $this->value_type->withTrace( | ||
$this->getTrace() | ||
->withFrame($this->toString()) | ||
); | ||
|
||
/** | ||
* @var list<Tv> $entries | ||
*/ | ||
$result = []; | ||
|
||
/** @var Tv $v */ | ||
foreach ($value as $v) { | ||
/** | ||
* @var array-key $i | ||
* @var Tv $v | ||
*/ | ||
foreach ($value as $i => $v) { | ||
/** @var Type\Type<Tv> $value_type */ | ||
$value_type = $this->value_type->withTrace( | ||
$this->getTrace() | ||
->withFrameAtPath($this->toString(), (string) $i) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also here It might help to build the frame name outside of the loop. |
||
); | ||
$result[] = $value_type->coerce($v); | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -94,4 +94,29 @@ public function testConversionFailure(): void | |
static::assertCount(0, $frames); | ||
} | ||
} | ||
|
||
public function testCoercionPath(): void | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's a start, but we'll need tests for every changed type individually. |
||
{ | ||
$type = Type\shape([ | ||
'articles' => Type\vec(Type\shape([ | ||
'name' => Type\string(), | ||
])) | ||
]); | ||
|
||
try { | ||
$type->coerce(['articles' => [['name' => null]]]); | ||
|
||
static::fail(Str\format( | ||
'Expected "%s" exception to be thrown.', | ||
Type\Exception\CoercionException::class | ||
)); | ||
} catch (Type\Exception\CoercionException $e) { | ||
static::assertSame( | ||
'Could not coerce "null" to type "string": at path articles.0.name', | ||
$e->getMessage() | ||
); | ||
|
||
static::assertCount(3, $e->getTypeTrace()->getPath()); | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
string concatenations are fast, but maybe it helps to build the frame name outside of the loop and use it instead of always recalculating the frame name?
It will always be the same value.