From 87a13a8c77adbdb72ab686ebd5b26e2e9f961140 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sat, 14 Jun 2014 15:00:35 +0200 Subject: [ticket/12575] Pass service_collection instead of ContainerInterface. PHPBB3-12575 --- phpBB/phpbb/di/service_collection.php | 2 +- phpBB/phpbb/di/service_collection_iterator.php | 32 ++++++-------------------- 2 files changed, 8 insertions(+), 26 deletions(-) (limited to 'phpBB') 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); } -- cgit v1.2.1 From f4602878562b046ae6f51ee7a23bf3e5f9a08126 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sat, 14 Jun 2014 15:01:08 +0200 Subject: [ticket/12575] Workaround for offsetExists seems not required for the Iterator. PHPBB3-12575 --- phpBB/phpbb/di/service_collection_iterator.php | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'phpBB') diff --git a/phpBB/phpbb/di/service_collection_iterator.php b/phpBB/phpbb/di/service_collection_iterator.php index 61d46af677..3fb5671cc5 100644 --- a/phpBB/phpbb/di/service_collection_iterator.php +++ b/phpBB/phpbb/di/service_collection_iterator.php @@ -36,21 +36,6 @@ class service_collection_iterator extends \ArrayIterator $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} */ @@ -60,7 +45,7 @@ class service_collection_iterator extends \ArrayIterator if ($task === null) { $name = $this->key(); - $task = $this->collection[$name]; + $task = $this->collection->offsetGet($name); $this->offsetSet($name, $task); } -- cgit v1.2.1 From 2149bd4e8f34092be8ef75cf59b9bd410d9a80d5 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sat, 14 Jun 2014 18:33:23 +0200 Subject: [ticket/12575] Do not duplicate logic in service_collection_iterator. PHPBB3-12575 --- phpBB/phpbb/di/service_collection_iterator.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'phpBB') diff --git a/phpBB/phpbb/di/service_collection_iterator.php b/phpBB/phpbb/di/service_collection_iterator.php index 3fb5671cc5..0d031ab52d 100644 --- a/phpBB/phpbb/di/service_collection_iterator.php +++ b/phpBB/phpbb/di/service_collection_iterator.php @@ -41,14 +41,6 @@ class service_collection_iterator extends \ArrayIterator */ public function current() { - $task = parent::current(); - if ($task === null) - { - $name = $this->key(); - $task = $this->collection->offsetGet($name); - $this->offsetSet($name, $task); - } - - return $task; + return $this->collection->offsetGet($this->key()); } } -- cgit v1.2.1 From 04e2fcd4d8d4e7364b234c072b31f1560461a006 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sat, 14 Jun 2014 19:01:53 +0200 Subject: [ticket/12575] Just forward service_collection::offsetGet() to container. PHPBB3-12575 --- phpBB/phpbb/di/service_collection.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'phpBB') diff --git a/phpBB/phpbb/di/service_collection.php b/phpBB/phpbb/di/service_collection.php index 4d0cb64114..82ca9bf679 100644 --- a/phpBB/phpbb/di/service_collection.php +++ b/phpBB/phpbb/di/service_collection.php @@ -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); } /** -- cgit v1.2.1