Merge remote-tracking branch 'upstream/prep-release-3.3.0'HEADmaster

1 files changed, 13 insertions, 2 deletions

diff --git a/tests/mock/container_builder.php b/tests/mock/container_builder.php
index 134589b0b8..17c4ae22dd 100644
--- a/tests/mock/container_builder.php
+++ b/tests/mock/container_builder.php
@@ -18,16 +18,22 @@ class phpbb_mock_container_builder implements ContainerInterface
 	protected $services = array();
 	protected $parameters = array();
 
+	public function __construct()
+	{
+		$this->setParameter('debug.load_time', false);
+		$this->setParameter('session.log_errors', false);
+	}
+
 	/**
 	* Sets a service.
 	*
 	* @param string $id      The service identifier
 	* @param object $service The service instance
-	* @param string $scope   The scope of the service
+	* @param bool $shared Whether service is shared
 	*
 	* @api
 	*/
-	public function set($id, $service, $scope = self::SCOPE_CONTAINER)
+	public function set($id, $service, $shared = false)
 	{
 		$this->services[$id] = $service;
 	}
@@ -193,4 +199,9 @@ class phpbb_mock_container_builder implements ContainerInterface
 	{
 		return false;
 	}
+
+	public function initialized($id)
+	{
+		return true;
+	}
 }