minor #22029 [DI] Remove useless state from ServiceLocator (nicolas-grekas)
This PR was merged into the 3.3-dev branch.
Discussion
----------
[DI] Remove useless state from ServiceLocator
| Q | A
| ------------- | ---
| Branch? | master
| Bug fix? | no
| New feature? | no
| BC breaks? | no (master only)
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
One less state to manage for the engine, and allows to deal with non-shared services.
Commits
-------
e0a5eecf2a
[DI] Remove useless state from ServiceLocator
This commit is contained in:
commit
4836007172
@ -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;
|
||||||
$this->values[$id] = $factory();
|
try {
|
||||||
$this->factories[$id] = false;
|
return $factory();
|
||||||
|
} finally {
|
||||||
|
$this->factories[$id] = $factory;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->values[$id];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function __invoke($id)
|
public function __invoke($id)
|
||||||
|
@ -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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user