8000 [PropertyAccess] fix type error handling when writing values by xabbuh · Pull Request #28220 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[PropertyAccess] fix type error handling when writing values #28220

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 1 commit into from
Aug 24, 2018
Merged

[PropertyAccess] fix type error handling when writing values #28220

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
7 changes: 6 additions & 1 deletion src/Symfony/Component/PropertyAccess/PropertyAccessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,12 @@ public static function handleError($type, $message, $file, $line, $context)

private static function throwInvalidArgumentException($message, $trace, $i)
{
if (isset($trace[$i]['file']) && __FILE__ === $trace[$i]['file'] && isset($trace[$i]['args'][0])) {
// the type mismatch is not caused by invalid arguments (but e.g. by an incompatible return type hint of the writer method)
if (0 !== strpos($message, 'Argument ')) {
return;
}

if (isset($trace[$i]['file']) && __FILE__ === $trace[$i]['file'] && array_key_exists(0, $trace[$i]['args'])) {
$pos = strpos($message, $delim = 'must be of the type ') ?: (strpos($message, $delim = 'must be an instance of ') ?: strpos($message, $delim = 'must implement interface '));
$pos += \strlen($delim);
$type = $trace[$i]['args'][0];
Expand Down
5 changes: 5 additions & 0 deletions src/Symfony/Component/PropertyAccess/Tests/Fixtures/ReturnTyped.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,9 @@ public function addFoo(\DateTime $dateTime)
public function removeFoo(\DateTime $dateTime)
{
}

public function setName($name): self
{
return 'This does not respect the return type on purpose.';
}
}
23 changes: 23 additions & 0 deletions src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,17 @@ public function testThrowTypeError()
$this->propertyAccessor->setValue($object, 'date', 'This is a string, \DateTime expected.');
}

/**
* @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidArgumentException
* @expectedExceptionMessage Expected argument of type "DateTime", "NULL" given
*/
public function testThrowTypeErrorWithNullArgument()
{
$object = new TypeHinted();

$this->propertyAccessor->setValue($object, 'date', null);
}

public function testSetTypeHint()
{
$date = new \DateTime();
Expand Down Expand Up @@ -579,4 +590,16 @@ public function testDoNotDiscardReturnTypeError()

$this->propertyAccessor->setValue($object, 'foos', array(new \DateTime()));
}

/**
* @requires PHP 7
*
* @expectedException \TypeError
*/
public function testDoNotDiscardReturnTypeErrorWhenWriterMethodIsMisconfigured()
{
$object = new ReturnTyped();

$this->propertyAccessor->setValue($object, 'name', 'foo');
}
}
0