Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix handling of PHP 7 Throwables during resolving #545

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
Nov 10, 2017
Merged

Fix handling of PHP 7 Throwables during resolving #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3380bb6
Fix handling of PHP 7 Throwables during resolving
pmlt Nov 9, 2017
2a6528d
Add test case for Throwable handling
pmlt Nov 10, 2017
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
4 changes: 1 addition & 3 deletions src/Container.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,10 +351,8 @@ private function resolveDefinition(Definition $definition, array $parameters = [
// Resolve the definition
try {
$value = $this->definitionResolver->resolve($definition, $parameters);
} catch (Exception $exception) {
} finally {
unset($this->entriesBeingResolved[$entryName]);

throw $exception;
}

unset($this->entriesBeingResolved[$entryName]);
Copy link
Contributor

@jdreesen jdreesen Nov 11, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this line really necessary anymore?

Copy link
Member

@mnapoli mnapoli Nov 11, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch I've removed it on master thanks

Expand Down
31 changes: 31 additions & 0 deletions tests/IntegrationTest/ContainerMakeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,35 @@ public function testProvidedPassByReferenceParameter(ContainerBuilder $builder)
]);
$this->assertEquals('bar', $object->foo);
}

/**
* Test that PHP-7 non-exceptions are correctly handled when resolving definitions.
* @dataProvider provideContainer
*/
public function testThrowableDuringResolve(ContainerBuilder $builder)
{
$builder->addDefinitions([
'tomorrow' => \DI\factory(function() {
// Cause a TypeError to be thrown in PHP 7 when this gets resolved
return (new \DateTime())->add('tomorrow');
})
]);
$container = $builder->build();
$exception = null;
try {
// First resolve should throw the TypeError
$container->make('tomorrow');
} catch (\Throwable $e) {
$exception = $e;
}
$this->assertInstanceOf('TypeError', $exception);
$exception = null;
try {
// Second error must ALSO throw the TypeError, not a circular exception
$container->make('tomorrow');
} catch (\Throwable $e) {
$exception = $e;
}
$this->assertInstanceOf('TypeError', $exception);
}
}