diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-06-14 15:00:35 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-14 15:00:35 +0200 |
| commit | 87a13a8c77adbdb72ab686ebd5b26e2e9f961140 (patch) | |
| tree | 84bb5d0145dc65cf78747df66407ce8d01868d11 | |
| parent | 88987306de00636dfadc7a4dad08048226eeaa59 (diff) | |
| download | forums-87a13a8c77adbdb72ab686ebd5b26e2e9f961140.tar forums-87a13a8c77adbdb72ab686ebd5b26e2e9f961140.tar.gz forums-87a13a8c77adbdb72ab686ebd5b26e2e9f961140.tar.bz2 forums-87a13a8c77adbdb72ab686ebd5b26e2e9f961140.tar.xz forums-87a13a8c77adbdb72ab686ebd5b26e2e9f961140.zip | |
[ticket/12575] Pass service_collection instead of ContainerInterface.
PHPBB3-12575
| -rw-r--r-- | phpBB/phpbb/di/service_collection.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/di/service_collection_iterator.php | 32 |
2 files changed, 8 insertions, 26 deletions
diff --git a/phpBB/phpbb/di/service_collection.php b/phpBB/phpbb/di/service_collection.php index a8eeeab8bb..4d0cb64114 100644 --- a/phpBB/phpbb/di/service_collection.php +++ b/phpBB/phpbb/di/service_collection.php @@ -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 diff --git a/phpBB/phpbb/di/service_collection_iterator.php b/phpBB/phpbb/di/service_collection_iterator.php index 54aefca1f7..61d46af677 100644 --- a/phpBB/phpbb/di/service_collection_iterator.php +++ b/phpBB/phpbb/di/service_collection_iterator.php @@ -13,45 +13,27 @@ 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) - { - parent::__construct($array, $flags); - $this->container = $container; - } - - /** - * {@inheritdoc} - */ - public function offsetGet($index) + public function __construct(service_collection $collection, $flags = 0) { - $task = parent::offsetGet($index); - if ($task === null) - { - $task = $this->container->get($index); - $this->offsetSet($index, $task); - } - - return $task; + parent::__construct($collection, $flags); + $this->collection = $collection; } // Because of a PHP issue we have to redefine offsetExists @@ -78,7 +60,7 @@ class service_collection_iterator extends \ArrayIterator if ($task === null) { $name = $this->key(); - $task = $this->container->get($name); + $task = $this->collection[$name]; $this->offsetSet($name, $task); } |