makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-13 14:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2593 from bantu/ticket/12575

Browse source 
[ticket/12575] Cleanup service_collection_iterator
This commit is contained in:
Dhruv Goel 2014-06-15 13:12:42 +05:30
commit 3a96c5b753
2 changed files with 9 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/phpbb/di/service_collection.php
View file

@ -40,7 +40,7 @@ class service_collection extends \ArrayObject
*/ */
public function getIterator() public function getIterator()
{ {
return new service_collection_iterator($this->container, $this); return new service_collection_iterator($this);
} }
// Because of a PHP issue we have to redefine offsetExists // Because of a PHP issue we have to redefine offsetExists
@ -63,14 +63,7 @@ class service_collection extends \ArrayObject
*/ */
public function offsetGet($index) public function offsetGet($index)
{ {
$task = parent::offsetGet($index); return $this->container->get($index);
if ($task === null)
{
$task = $this->container->get($index);
$this->offsetSet($index, $task);
}
return $task;
} }
/** /**

55
phpBB/phpbb/di/service_collection_iterator.php
View file

@ -13,75 +13,34 @@
namespace phpbb\di; namespace phpbb\di;
use Symfony\Component\DependencyInjection\ContainerInterface;
/** /**
* Iterator which loads the services when they are requested * Iterator which loads the services when they are requested
*/ */
class service_collection_iterator extends \ArrayIterator class service_collection_iterator extends \ArrayIterator
{ {
/** /**
* @var \Symfony\Component\DependencyInjection\ContainerInterface * @var \phpbb\di\service_collection
*/ */
protected $container; protected $collection;
/** /**
* Construct an ArrayIterator for service_collection * Construct an ArrayIterator for service_collection
* *
* @param ContainerInterface $container Container object * @param \phpbb\di\service_collection $collection The collection to iterate over
* @param array $array The array or object to be iterated on.
* @param int $flags Flags to control the behaviour of the ArrayObject object. * @param int $flags Flags to control the behaviour of the ArrayObject object.
* @see ArrayObject::setFlags() * @see ArrayObject::setFlags()
*/ */
public function __construct(ContainerInterface $container, $array = array(), $flags = 0) public function __construct(service_collection $collection, $flags = 0)
{ {
parent::__construct($array, $flags); parent::__construct($collection, $flags);
$this->container = $container; $this->collection = $collection;
} }
/**
* {@inheritdoc}
*/
public function offsetGet($index)
{
$task = parent::offsetGet($index);
if ($task === null)
{
$task = $this->container->get($index);
$this->offsetSet($index, $task);
}
return $task;
}
// Because of a PHP issue we have to redefine offsetExists
// (even with a call to the parent):
// https://bugs.php.net/bug.php?id=66834
// https://bugs.php.net/bug.php?id=67067
// But it triggers a sniffer issue that we have to skip
// @codingStandardsIgnoreStart
/**
* {@inheritdoc}
*/
public function offsetExists($index)
{
parent::offsetExists($index);
}
// @codingStandardsIgnoreEnd
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function current() public function current()
{ {
$task = parent::current(); return $this->collection->offsetGet($this->key());
if ($task === null)
{
$name = $this->key();
$task = $this->container->get($name);
$this->offsetSet($name, $task);
}
return $task;
} }
} }