From 87a13a8c77adbdb72ab686ebd5b26e2e9f961140 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 14 Jun 2014 15:00:35 +0200
Subject: [PATCH] [ticket/12575] Pass service_collection instead of
 ContainerInterface.

PHPBB3-12575
---
 phpBB/phpbb/di/service_collection.php         |  2 +-
 .../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)
+	public function __construct(service_collection $collection, $flags = 0)
 	{
-		parent::__construct($array, $flags);
-		$this->container = $container;
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function offsetGet($index)
-	{
-		$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);
 		}