diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-11-16 14:35:45 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-11-16 14:35:45 +0100 |
| commit | 791d633b8aad5e29d1c1a9fda844908d694a8341 (patch) | |
| tree | e422fbd329528900449c68c58c1790a141a45f37 | |
| parent | e39c0be8f8a112684901e72ffac51ce937f806e5 (diff) | |
| parent | 3e22a2eebdc29ae6f2dc828f0886888fb2d385a8 (diff) | |
| download | forums-791d633b8aad5e29d1c1a9fda844908d694a8341.tar forums-791d633b8aad5e29d1c1a9fda844908d694a8341.tar.gz forums-791d633b8aad5e29d1c1a9fda844908d694a8341.tar.bz2 forums-791d633b8aad5e29d1c1a9fda844908d694a8341.tar.xz forums-791d633b8aad5e29d1c1a9fda844908d694a8341.zip | |
Merge pull request #5733 from mrgoldy/ticket/16206
[ticket/16206] Remove no longer needed workaround for PHP bug #66834
| -rw-r--r-- | phpBB/phpbb/di/service_collection.php | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/phpBB/phpbb/di/service_collection.php b/phpBB/phpbb/di/service_collection.php index 8c1c172e36..6298670c42 100644 --- a/phpBB/phpbb/di/service_collection.php +++ b/phpBB/phpbb/di/service_collection.php @@ -49,21 +49,6 @@ class service_collection extends \ArrayObject return new service_collection_iterator($this); } - // 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) - { - return parent::offsetExists($index); - } - // @codingStandardsIgnoreEnd - /** * {@inheritdoc} */ @@ -76,11 +61,11 @@ class service_collection extends \ArrayObject * Add a service to the collection * * @param string $name The service name - * @return null + * @return void */ public function add($name) { - $this->offsetSet($name, null); + $this->offsetSet($name, false); } /** |