aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/di
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-06-14 15:01:08 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-06-14 18:06:43 +0200
commitf4602878562b046ae6f51ee7a23bf3e5f9a08126 (patch)
tree6b114192fcf291baf26fc3aae0bd3134a10c366d /phpBB/phpbb/di
parent87a13a8c77adbdb72ab686ebd5b26e2e9f961140 (diff)
downloadforums-f4602878562b046ae6f51ee7a23bf3e5f9a08126.tar
forums-f4602878562b046ae6f51ee7a23bf3e5f9a08126.tar.gz
forums-f4602878562b046ae6f51ee7a23bf3e5f9a08126.tar.bz2
forums-f4602878562b046ae6f51ee7a23bf3e5f9a08126.tar.xz
forums-f4602878562b046ae6f51ee7a23bf3e5f9a08126.zip
[ticket/12575] Workaround for offsetExists seems not required for the Iterator.
PHPBB3-12575
Diffstat (limited to 'phpBB/phpbb/di')
-rw-r--r--phpBB/phpbb/di/service_collection_iterator.php17
1 files changed, 1 insertions, 16 deletions
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);
}