diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DI] Remove useless state from ServiceLocator

Browse Source
This commit is contained in:
Nicolas Grekas 2017-03-16 19:01:53 +01:00
parent 18bbf3741a
commit e0a5eecf2a
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Symfony/Component/DependencyInjection/ServiceLocator.php
View File

@ -22,7 +22,6 @@ use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
class ServiceLocator implements PsrContainerInterface class ServiceLocator implements PsrContainerInterface
{ {
private $factories; private $factories;
private $values = array();
/** /**
* @param callable[] $factories * @param callable[] $factories
@ -53,13 +52,12 @@ class ServiceLocator implements PsrContainerInterface
throw new ServiceCircularReferenceException($id, array($id, $id)); throw new ServiceCircularReferenceException($id, array($id, $id));
} }
if (false !== $factory) { $this->factories[$id] = true;
$this->factories[$id] = true; try {
$this->values[$id] = $factory(); return $factory();
$this->factories[$id] = false; } finally {
$this->factories[$id] = $factory;
} }
return $this->values[$id];
} }
public function __invoke($id) public function __invoke($id)

13
src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php
View File

@ -40,15 +40,20 @@ class ServiceLocatorTest extends TestCase
$this->assertSame('baz', $locator->get('bar')); $this->assertSame('baz', $locator->get('bar'));
} }
public function testGetDoesNotExecuteTheSameCallableTwice() public function testGetDoesNotMemoize()
{ {
$i = 0; $i = 0;
$locator = new ServiceLocator(array('foo' => function () use (&$i) { $i++; return 'bar'; })); $locator = new ServiceLocator(array(
'foo' => function () use (&$i) {
++$i;
return 'bar';
},
));
$this->assertSame('bar', $locator->get('foo')); $this->assertSame('bar', $locator->get('foo'));
$this->assertSame('bar', $locator->get('foo')); $this->assertSame('bar', $locator->get('foo'));
$this->assertSame('bar', $locator->get('foo')); $this->assertSame(2, $i);
$this->assertSame(1, $i);
} }
/** /**