Skip to content

Commit

Permalink
Merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
philipobenito committed May 10, 2017
2 parents a58737a + e541429 commit e4c1f5e
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions tests/ReflectionContainerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ public function testCallReflectsOnStaticMethodArguments()
{
$container = new ReflectionContainer;

$container->setContainer($container);

$container->call('League\Container\Test\Asset\Foo::staticSetBar');

$this->assertInstanceOf('League\Container\Test\Asset\Bar', Asset\Foo::$staticBar);
Expand Down

0 comments on commit e4c1f5e

Please sign in to comment.