1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-21 08:00:46 +01:00

Merge pull request #5733 from mrgoldy/ticket/16206

[ticket/16206] Remove no longer needed workaround for PHP bug #66834
This commit is contained in:
Marc Alexander 2019-11-16 14:35:45 +01:00
commit 791d633b8a
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995

View File

@ -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);
}
/**