6 files changed, 14 insertions, 63 deletions
diff --git a/phpBB/phpbb/di/extension/config.php b/phpBB/phpbb/di/extension/config.php
index 403c9d50e7..a7d7284f85 100644
--- a/phpBB/phpbb/di/extension/config.php
+++ b/phpBB/phpbb/di/extension/config.php
@@ -15,8 +15,6 @@ namespace phpbb\di\extension;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Component\Config\FileLocator;
 
 /**
 * Container config extension
@@ -34,7 +32,7 @@ class config extends Extension
 	* @param array            $config    An array of configuration values
 	* @param ContainerBuilder $container A ContainerBuilder instance
 	*
-	* @throws InvalidArgumentException When provided tag is not defined in this extension
+	* @throws \InvalidArgumentException When provided tag is not defined in this extension
 	*/
 	public function load(array $config, ContainerBuilder $container)
 	{
@@ -68,7 +66,7 @@ class config extends Extension
 	* Convert 3.0 ACM type to 3.1 cache driver class name
 	*
 	* @param string $acm_type ACM type
-	* @return cache driver class
+	* @return string cache driver class
 	*/
 	protected function convert_30_acm_type($acm_type)
 	{
diff --git a/phpBB/phpbb/di/extension/core.php b/phpBB/phpbb/di/extension/core.php
index 72026f3b54..ca4fa5c082 100644
--- a/phpBB/phpbb/di/extension/core.php
+++ b/phpBB/phpbb/di/extension/core.php
@@ -45,7 +45,7 @@ class core extends Extension
 	* @param array            $config    An array of configuration values
 	* @param ContainerBuilder $container A ContainerBuilder instance
 	*
-	* @throws InvalidArgumentException When provided tag is not defined in this extension
+	* @throws \InvalidArgumentException When provided tag is not defined in this extension
 	*/
 	public function load(array $config, ContainerBuilder $container)
 	{
diff --git a/phpBB/phpbb/di/extension/ext.php b/phpBB/phpbb/di/extension/ext.php
index 1205dffb53..718c992d2e 100644
--- a/phpBB/phpbb/di/extension/ext.php
+++ b/phpBB/phpbb/di/extension/ext.php
@@ -39,7 +39,7 @@ class ext extends Extension
 	* @param array            $config    An array of configuration values
 	* @param ContainerBuilder $container A ContainerBuilder instance
 	*
-	* @throws InvalidArgumentException When provided tag is not defined in this extension
+	* @throws \InvalidArgumentException When provided tag is not defined in this extension
 	*/
 	public function load(array $config, ContainerBuilder $container)
 	{
diff --git a/phpBB/phpbb/di/pass/kernel_pass.php b/phpBB/phpbb/di/pass/kernel_pass.php
index 44d4fcd07f..c154c7532d 100644
--- a/phpBB/phpbb/di/pass/kernel_pass.php
+++ b/phpBB/phpbb/di/pass/kernel_pass.php
@@ -23,6 +23,7 @@ class kernel_pass implements CompilerPassInterface
 	*
 	* @param ContainerBuilder $container ContainerBuilder object
 	* @return null
+	* @throws \InvalidArgumentException
 	*/
 	public function process(ContainerBuilder $container)
 	{
diff --git a/phpBB/phpbb/di/service_collection.php b/phpBB/phpbb/di/service_collection.php
index a8eeeab8bb..82ca9bf679 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
@@ -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);
 	}
 
 	/**
diff --git a/phpBB/phpbb/di/service_collection_iterator.php b/phpBB/phpbb/di/service_collection_iterator.php
index 54aefca1f7..0d031ab52d 100644
--- a/phpBB/phpbb/di/service_collection_iterator.php
+++ b/phpBB/phpbb/di/service_collection_iterator.php
@@ -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)
-	{
-		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
-	// (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());
 	}
 }