mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-06 14:35:56 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12575] Just forward service_collection::offsetGet() to container.
  [ticket/12575] Do not duplicate logic in service_collection_iterator.
  [ticket/12575] Workaround for offsetExists seems not required for the Iterator.
  [ticket/12575] Pass service_collection instead of ContainerInterface.
This commit is contained in:
Dhruv 2014-06-15 13:14:03 +05:30
commit bf8b8de862
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()
{
return new service_collection_iterator($this->container, $this);
return new service_collection_iterator($this);
}
// Because of a PHP issue we have to redefine offsetExists
@ -63,14 +63,7 @@ class service_collection extends \ArrayObject
*/
public function offsetGet($index)
{
$task = parent::offsetGet($index);
if ($task === null)
{
$task = $this->container->get($index);
$this->offsetSet($index, $task);
}
return $task;
return $this->container->get($index);
}
/**

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

@ -13,75 +13,34 @@
namespace phpbb\di;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Iterator which loads the services when they are requested
*/
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
*
* @param ContainerInterface $container Container object
* @param array $array The array or object to be iterated on.
* @param \phpbb\di\service_collection $collection The collection to iterate over
* @param int $flags Flags to control the behaviour of the ArrayObject object.
* @see ArrayObject::setFlags()
*/
public function __construct(ContainerInterface $container, $array = array(), $flags = 0)
public function __construct(service_collection $collection, $flags = 0)
{
parent::__construct($array, $flags);
$this->container = $container;
parent::__construct($collection, $flags);
$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}
*/
public function current()
{
$task = parent::current();
if ($task === null)
{
$name = $this->key();
$task = $this->container->get($name);
$this->offsetSet($name, $task);
}
return $task;
return $this->collection->offsetGet($this->key());
}
}