2 files changed, 148 insertions, 6 deletions
diff --git a/phpBB/phpbb/extension/di/extension_base.php b/phpBB/phpbb/extension/di/extension_base.php
new file mode 100644
index 0000000000..30cc37dbb6
--- /dev/null
+++ b/phpBB/phpbb/extension/di/extension_base.php
@@ -0,0 +1,137 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\extension\di;
+
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+
+/**
+ * Container core extension
+ */
+class extension_base extends Extension
+{
+	/**
+	 * Name of the extension (vendor/name)
+	 *
+	 * @var string
+	 */
+	protected $extension_name;
+
+	/**
+	 * Path to the extension.
+	 *
+	 * @var string
+	 */
+	protected $ext_path;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $extension_name Name of the extension (vendor/name)
+	 * @param string $ext_path       Path to the extension
+	 */
+	public function __construct($extension_name, $ext_path)
+	{
+		$this->extension_name = $extension_name;
+		$this->ext_path = $ext_path;
+	}
+
+	/**
+	 * Loads a specific configuration.
+	 *
+	 * @param array            $configs   An array of configuration values
+	 * @param ContainerBuilder $container A ContainerBuilder instance
+	 *
+	 * @throws \InvalidArgumentException When provided tag is not defined in this extension
+	 */
+	public function load(array $configs, ContainerBuilder $container)
+	{
+		$this->load_services($container);
+	}
+
+	/**
+	 * Loads the services.yml file.
+	 *
+	 * @param ContainerBuilder $container A ContainerBuilder instance
+	 */
+	protected function load_services(ContainerBuilder $container)
+	{
+		$services_directory = false;
+		$services_file = false;
+
+		if (file_exists($this->ext_path . 'config/' . $container->getParameter('core.environment') . '/container/environment.yml'))
+		{
+			$services_directory = $this->ext_path . 'config/' . $container->getParameter('core.environment') . '/container/';
+			$services_file = 'environment.yml';
+		}
+		else if (!is_dir($this->ext_path . 'config/' . $container->getParameter('core.environment')))
+		{
+			if (file_exists($this->ext_path . 'config/default/container/environment.yml'))
+			{
+				$services_directory = $this->ext_path . 'config/default/container/';
+				$services_file = 'environment.yml';
+			}
+			else if (!is_dir($this->ext_path . 'config/default') && file_exists($this->ext_path . '/config/services.yml'))
+			{
+				$services_directory = $this->ext_path . 'config';
+				$services_file = 'services.yml';
+			}
+		}
+
+		if ($services_directory && $services_file)
+		{
+			$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($services_directory)));
+			$loader->load($services_file);
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getConfiguration(array $config, ContainerBuilder $container)
+	{
+		$reflected = new \ReflectionClass($this);
+		$namespace = $reflected->getNamespaceName();
+
+		$class = $namespace . '\\di\configuration';
+		if (class_exists($class))
+		{
+			$r = new \ReflectionClass($class);
+			$container->addResource(new FileResource($r->getFileName()));
+
+			if (!method_exists($class, '__construct'))
+			{
+				$configuration = new $class();
+
+				return $configuration;
+			}
+		}
+
+	}
+
+	/**
+	 * Returns the recommended alias to use in XML.
+	 *
+	 * This alias is also the mandatory prefix to use when using YAML.
+	 *
+	 * @return string The alias
+	 */
+	public function getAlias()
+	{
+		return str_replace('/', '_', $this->extension_name);
+	}
+}
diff --git a/phpBB/phpbb/extension/manager.php b/phpBB/phpbb/extension/manager.php
index 76f0e3558e..880973d5fb 100644
--- a/phpBB/phpbb/extension/manager.php
+++ b/phpBB/phpbb/extension/manager.php
@@ -464,15 +464,17 @@ class manager
 	* All enabled and disabled extensions are considered configured. A purged
 	* extension that is no longer in the database is not configured.
 	*
+	* @param bool $phpbb_relative Whether the path should be relative to phpbb root
+	*
 	* @return array An array with extension names as keys and and the
 	*               database stored extension information as values
 	*/
-	public function all_configured()
+	public function all_configured($phpbb_relative = true)
 	{
 		$configured = array();
 		foreach ($this->extensions as $name => $data)
 		{
-			$data['ext_path'] = $this->phpbb_root_path . $data['ext_path'];
+			$data['ext_path'] = ($phpbb_relative ? $this->phpbb_root_path : '') . $data['ext_path'];
 			$configured[$name] = $data;
 		}
 		return $configured;
@@ -480,18 +482,19 @@ class manager
 
 	/**
 	* Retrieves all enabled extensions.
+	* @param bool $phpbb_relative Whether the path should be relative to phpbb root
 	*
 	* @return array An array with extension names as keys and and the
 	*               database stored extension information as values
 	*/
-	public function all_enabled()
+	public function all_enabled($phpbb_relative = true)
 	{
 		$enabled = array();
 		foreach ($this->extensions as $name => $data)
 		{
 			if ($data['ext_active'])
 			{
-				$enabled[$name] = $this->phpbb_root_path . $data['ext_path'];
+				$enabled[$name] = ($phpbb_relative ? $this->phpbb_root_path : '') . $data['ext_path'];
 			}
 		}
 		return $enabled;
@@ -500,17 +503,19 @@ class manager
 	/**
 	* Retrieves all disabled extensions.
 	*
+	* @param bool $phpbb_relative Whether the path should be relative to phpbb root
+	*
 	* @return array An array with extension names as keys and and the
 	*               database stored extension information as values
 	*/
-	public function all_disabled()
+	public function all_disabled($phpbb_relative = true)
 	{
 		$disabled = array();
 		foreach ($this->extensions as $name => $data)
 		{
 			if (!$data['ext_active'])
 			{
-				$disabled[$name] = $this->phpbb_root_path . $data['ext_path'];
+				$disabled[$name] = ($phpbb_relative ? $this->phpbb_root_path : '') . $data['ext_path'];
 			}
 		}
 		return $disabled;