From deb556fbf05eeec447234f15f4eada58526f0b81 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Tue, 4 Jul 2017 16:39:18 +0200
Subject: [ticket/15258] Adds a method to get a service by class in
 service_collection

PHPBB3-15258
---
 phpBB/phpbb/di/service_collection.php | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'phpBB/phpbb/di/service_collection.php')

diff --git a/phpBB/phpbb/di/service_collection.php b/phpBB/phpbb/di/service_collection.php
index 8e9175e204..8c1c172e36 100644
--- a/phpBB/phpbb/di/service_collection.php
+++ b/phpBB/phpbb/di/service_collection.php
@@ -103,4 +103,35 @@ class service_collection extends \ArrayObject
 	{
 		return $this->service_classes;
 	}
+
+	/**
+	 * Returns the service associated to a class
+	 *
+	 * @return mixed
+	 * @throw \RuntimeException if the
+	 */
+	public function get_by_class($class)
+	{
+		$service_id = null;
+
+		foreach ($this->service_classes as $id => $service_class)
+		{
+			if ($service_class === $class)
+			{
+				if ($service_id !== null)
+				{
+					throw new \RuntimeException('More than one service definitions found for class "'.$class.'" in collection.');
+				}
+
+				$service_id = $id;
+			}
+		}
+
+		if ($service_id === null)
+		{
+			throw new \RuntimeException('No service found for class "'.$class.'" in collection.');
+		}
+
+		return $this->offsetGet($service_id);
+	}
 }
-- 
cgit v1.2.1


From 3e22a2eebdc29ae6f2dc828f0886888fb2d385a8 Mon Sep 17 00:00:00 2001
From: mrgoldy <gijsmartens1@gmail.com>
Date: Sun, 10 Nov 2019 22:28:53 +0100
Subject: [ticket/16206] Remove offsetExists and set non-NULL value

PHPBB3-16206
---
 phpBB/phpbb/di/service_collection.php | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'phpBB/phpbb/di/service_collection.php')

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);
 	}
 
 	/**
-- 
cgit v1.2.1