From 4636212f26083a1e4ac3ce4f0a12ee2a0236d829 Mon Sep 17 00:00:00 2001
From: Allon Moritz <allon.moritz@digital-peak.com>
Date: Wed, 14 Feb 2018 08:18:49 +0100
Subject: [PATCH] Revert not needed interface

---
 .../Extension/ComponentContainerInterface.php |  2 +-
 .../Extension/ExtensionContainerInterface.php | 20 -------------------
 libraries/src/Extension/ExtensionLoader.php   |  4 ++--
 3 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 libraries/src/Extension/ExtensionContainerInterface.php

diff --git a/libraries/src/Extension/ComponentContainerInterface.php b/libraries/src/Extension/ComponentContainerInterface.php
index 156f8589795a4..2b594cf12d01a 100644
--- a/libraries/src/Extension/ComponentContainerInterface.php
+++ b/libraries/src/Extension/ComponentContainerInterface.php
@@ -17,7 +17,7 @@
  *
  * @since  __DEPLOY_VERSION__
  */
-interface ComponentContainerInterface extends ExtensionContainerInterface
+interface ComponentContainerInterface
 {
 	/**
 	 * Returns the category service. If the service is not available
diff --git a/libraries/src/Extension/ExtensionContainerInterface.php b/libraries/src/Extension/ExtensionContainerInterface.php
deleted file mode 100644
index 039c53b60d5c3..0000000000000
--- a/libraries/src/Extension/ExtensionContainerInterface.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Joomla! Content Management System
- *
- * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\CMS\Extension;
-
-defined('JPATH_PLATFORM') or die;
-
-/**
- * Access to component specific services.
- *
- * @since  __DEPLOY_VERSION__
- */
-interface ExtensionContainerInterface
-{
-}
diff --git a/libraries/src/Extension/ExtensionLoader.php b/libraries/src/Extension/ExtensionLoader.php
index 9e82527b4ddba..7fd29d3b5694b 100644
--- a/libraries/src/Extension/ExtensionLoader.php
+++ b/libraries/src/Extension/ExtensionLoader.php
@@ -48,11 +48,11 @@ public function bootComponent($component): ComponentContainerInterface
 	 * @param   string  $extensionName  The extension name
 	 * @param   string  $extensionPath  The path of the extension
 	 *
-	 * @return  ExtensionContainerInterface  The service container
+	 * @return  mixed  The extension service container
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 */
-	private function loadExtensionContainer($serviceName, $extensionName, $extensionPath): ExtensionContainerInterface
+	private function loadExtensionContainer($serviceName, $extensionName, $extensionPath)
 	{
 		// The container which holds the component container
 		$container = $this->getContainer();