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

[ticket/12575] Pass service_collection instead of ContainerInterface.

Browse source 
PHPBB3-12575
This commit is contained in:
Andreas Fischer 2014-06-14 15:00:35 +02:00
parent 88987306de
commit 87a13a8c77
2 changed files with 8 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
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

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

@ -13,45 +13,27 @@
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 // Because of a PHP issue we have to redefine offsetExists
@ -78,7 +60,7 @@ class service_collection_iterator extends \ArrayIterator
if ($task === null) if ($task === null)
{ {
$name = $this->key(); $name = $this->key();
$task = $this->container->get($name); $task = $this->collection[$name];
$this->offsetSet($name, $task); $this->offsetSet($name, $task);
} }