8 files changed, 380 insertions, 675 deletions
diff --git a/phpBB/phpbb/extension/base.php b/phpBB/phpbb/extension/base.php
index 1f871750e0..5bb530bad4 100644
--- a/phpBB/phpbb/extension/base.php
+++ b/phpBB/phpbb/extension/base.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package extension
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
 */
 
@@ -13,15 +17,13 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
 * A base class for extensions without custom enable/disable/purge code.
-*
-* @package extension
 */
 class base implements \phpbb\extension\extension_interface
 {
 	/** @var ContainerInterface */
 	protected $container;
 
-	/** @var \phpbb\extension\finder */
+	/** @var \phpbb\finder */
 	protected $finder;
 
 	/** @var \phpbb\db\migrator */
@@ -33,15 +35,19 @@ class base implements \phpbb\extension\extension_interface
 	/** @var string */
 	protected $extension_path;
 
+	/** @var string[] */
+	private $migrations = false;
+
 	/**
 	* Constructor
 	*
 	* @param ContainerInterface $container Container object
-	* @param \phpbb\extension\finder $extension_finder
+	* @param \phpbb\finder $extension_finder
+	* @param \phpbb\db\migrator $migrator
 	* @param string $extension_name Name of this extension (from ext.manager)
 	* @param string $extension_path Relative path to this extension
 	*/
-	public function __construct(ContainerInterface $container, \phpbb\extension\finder $extension_finder, \phpbb\db\migrator $migrator, $extension_name, $extension_path)
+	public function __construct(ContainerInterface $container, \phpbb\finder $extension_finder, \phpbb\db\migrator $migrator, $extension_name, $extension_path)
 	{
 		$this->container = $container;
 		$this->extension_finder = $extension_finder;
@@ -52,6 +58,14 @@ class base implements \phpbb\extension\extension_interface
 	}
 
 	/**
+	* {@inheritdoc}
+	*/
+	public function is_enableable()
+	{
+		return true;
+	}
+
+	/**
 	* Single enable step that installs any included migrations
 	*
 	* @param mixed $old_state State returned by previous call of this method
@@ -111,17 +125,16 @@ class base implements \phpbb\extension\extension_interface
 	*/
 	protected function get_migration_file_list()
 	{
-		static $migrations = false;
-
-		if ($migrations !== false)
+		if ($this->migrations !== false)
 		{
-			return $migrations;
+			return $this->migrations;
 		}
 
 		// Only have the finder search in this extension path directory
 		$migrations = $this->extension_finder
 			->extension_directory('/migrations')
 			->find_from_extension($this->extension_name, $this->extension_path);
+
 		$migrations = $this->extension_finder->get_classes_from_files($migrations);
 
 		return $migrations;
diff --git a/phpBB/phpbb/extension/di/extension_base.php b/phpBB/phpbb/extension/di/extension_base.php
new file mode 100644
index 0000000000..ba74615e70
--- /dev/null
+++ b/phpBB/phpbb/extension/di/extension_base.php
@@ -0,0 +1,138 @@
+<?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)
+		{
+			$filesystem = new \phpbb\filesystem\filesystem();
+			$loader = new YamlFileLoader($container, new FileLocator($filesystem->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/exception.php b/phpBB/phpbb/extension/exception.php
index 82327c9d5e..9050449bf1 100644
--- a/phpBB/phpbb/extension/exception.php
+++ b/phpBB/phpbb/extension/exception.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package extension
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
 */
 
@@ -12,10 +16,6 @@ namespace phpbb\extension;
 /**
  * Exception class for metadata
  */
-class exception extends \UnexpectedValueException
+class exception extends \phpbb\exception\runtime_exception
 {
-	public function __toString()
-	{
-		return $this->getMessage();
-	}
 }
diff --git a/phpBB/phpbb/extension/extension_interface.php b/phpBB/phpbb/extension/extension_interface.php
index bddff51b5a..6a6b6adb8f 100644
--- a/phpBB/phpbb/extension/extension_interface.php
+++ b/phpBB/phpbb/extension/extension_interface.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package extension
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
 */
 
@@ -12,12 +16,17 @@ namespace phpbb\extension;
 /**
 * The interface extension meta classes have to implement to run custom code
 * on enable/disable/purge.
-*
-* @package extension
 */
 interface extension_interface
 {
 	/**
+	* Indicate whether or not the extension can be enabled.
+	*
+	* @return bool
+	*/
+	public function is_enableable();
+
+	/**
 	* enable_step is executed on enabling an extension until it returns false.
 	*
 	* Calls to this function can be made in subsequent requests, when the
diff --git a/phpBB/phpbb/extension/finder.php b/phpBB/phpbb/extension/finder.php
deleted file mode 100644
index c9c16ae6d5..0000000000
--- a/phpBB/phpbb/extension/finder.php
+++ /dev/null
@@ -1,525 +0,0 @@
-<?php
-/**
-*
-* @package extension
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-namespace phpbb\extension;
-
-/**
-* The extension finder provides a simple way to locate files in active extensions
-*
-* @package extension
-*/
-class finder
-{
-	protected $extension_manager;
-	protected $filesystem;
-	protected $phpbb_root_path;
-	protected $cache;
-	protected $php_ext;
-
-	/**
-	* The cache variable name used to store $this->cached_queries in $this->cache.
-	*
-	* Allows the use of multiple differently configured finders with the same cache.
-	* @var string
-	*/
-	protected $cache_name;
-
-	/**
-	* An associative array, containing all search parameters set in methods.
-	* @var	array
-	*/
-	protected $query;
-
-	/**
-	* A map from md5 hashes of serialized queries to their previously retrieved
-	* results.
-	* @var	array
-	*/
-	protected $cached_queries;
-
-	/**
-	* Creates a new finder instance with its dependencies
-	*
-	* @param \phpbb\extension\manager $extension_manager An extension manager
-	*            instance that provides the finder with a list of active
-	*            extensions and their locations
-	* @param \phpbb\filesystem $filesystem Filesystem instance
-	* @param string $phpbb_root_path Path to the phpbb root directory
-	* @param \phpbb\cache\driver\driver_interface $cache A cache instance or null
-	* @param string $php_ext php file extension
-	* @param string $cache_name The name of the cache variable, defaults to
-	*                           _ext_finder
-	*/
-	public function __construct(\phpbb\extension\manager $extension_manager, \phpbb\filesystem $filesystem, $phpbb_root_path = '', \phpbb\cache\driver\driver_interface $cache = null, $php_ext = 'php', $cache_name = '_ext_finder')
-	{
-		$this->extension_manager = $extension_manager;
-		$this->filesystem = $filesystem;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->cache = $cache;
-		$this->php_ext = $php_ext;
-		$this->cache_name = $cache_name;
-
-		$this->query = array(
-			'core_path' => false,
-			'core_suffix' => false,
-			'core_prefix' => false,
-			'core_directory' => false,
-			'extension_suffix' => false,
-			'extension_prefix' => false,
-			'extension_directory' => false,
-		);
-
-		$this->cached_queries = ($this->cache) ? $this->cache->get($this->cache_name) : false;
-	}
-
-	/**
-	* Sets a core path to be searched in addition to extensions
-	*
-	* @param string $core_path The path relative to phpbb_root_path
-	* @return \phpbb\extension\finder This object for chaining calls
-	*/
-	public function core_path($core_path)
-	{
-		$this->query['core_path'] = $core_path;
-		return $this;
-	}
-
-	/**
-	* Sets the suffix all files found in extensions and core must match.
-	*
-	* There is no default file extension, so to find PHP files only, you will
-	* have to specify .php as a suffix. However when using get_classes, the .php
-	* file extension is automatically added to suffixes.
-	*
-	* @param string $suffix A filename suffix
-	* @return \phpbb\extension\finder This object for chaining calls
-	*/
-	public function suffix($suffix)
-	{
-		$this->core_suffix($suffix);
-		$this->extension_suffix($suffix);
-		return $this;
-	}
-
-	/**
-	* Sets a suffix all files found in extensions must match
-	*
-	* There is no default file extension, so to find PHP files only, you will
-	* have to specify .php as a suffix. However when using get_classes, the .php
-	* file extension is automatically added to suffixes.
-	*
-	* @param string $extension_suffix A filename suffix
-	* @return \phpbb\extension\finder This object for chaining calls
-	*/
-	public function extension_suffix($extension_suffix)
-	{
-		$this->query['extension_suffix'] = $extension_suffix;
-		return $this;
-	}
-
-	/**
-	* Sets a suffix all files found in the core path must match
-	*
-	* There is no default file extension, so to find PHP files only, you will
-	* have to specify .php as a suffix. However when using get_classes, the .php
-	* file extension is automatically added to suffixes.
-	*
-	* @param string $core_suffix A filename suffix
-	* @return \phpbb\extension\finder This object for chaining calls
-	*/
-	public function core_suffix($core_suffix)
-	{
-		$this->query['core_suffix'] = $core_suffix;
-		return $this;
-	}
-
-	/**
-	* Sets the prefix all files found in extensions and core must match
-	*
-	* @param string $prefix A filename prefix
-	* @return \phpbb\extension\finder This object for chaining calls
-	*/
-	public function prefix($prefix)
-	{
-		$this->core_prefix($prefix);
-		$this->extension_prefix($prefix);
-		return $this;
-	}
-
-	/**
-	* Sets a prefix all files found in extensions must match
-	*
-	* @param string $extension_prefix A filename prefix
-	* @return \phpbb\extension\finder This object for chaining calls
-	*/
-	public function extension_prefix($extension_prefix)
-	{
-		$this->query['extension_prefix'] = $extension_prefix;
-		return $this;
-	}
-
-	/**
-	* Sets a prefix all files found in the core path must match
-	*
-	* @param string $core_prefix A filename prefix
-	* @return \phpbb\extension\finder This object for chaining calls
-	*/
-	public function core_prefix($core_prefix)
-	{
-		$this->query['core_prefix'] = $core_prefix;
-		return $this;
-	}
-
-	/**
-	* Sets a directory all files found in extensions and core must be contained in
-	*
-	* Automatically sets the core_directory if its value does not differ from
-	* the current directory.
-	*
-	* @param string $directory
-	* @return \phpbb\extension\finder This object for chaining calls
-	*/
-	public function directory($directory)
-	{
-		$this->core_directory($directory);
-		$this->extension_directory($directory);
-		return $this;
-	}
-
-	/**
-	* Sets a directory all files found in extensions must be contained in
-	*
-	* @param string $extension_directory
-	* @return \phpbb\extension\finder This object for chaining calls
-	*/
-	public function extension_directory($extension_directory)
-	{
-		$this->query['extension_directory'] = $this->sanitise_directory($extension_directory);
-		return $this;
-	}
-
-	/**
-	* Sets a directory all files found in the core path must be contained in
-	*
-	* @param string $core_directory
-	* @return \phpbb\extension\finder This object for chaining calls
-	*/
-	public function core_directory($core_directory)
-	{
-		$this->query['core_directory'] = $this->sanitise_directory($core_directory);
-		return $this;
-	}
-
-	/**
-	* Removes occurances of /./ and makes sure path ends without trailing slash
-	*
-	* @param string $directory A directory pattern
-	* @return string A cleaned up directory pattern
-	*/
-	protected function sanitise_directory($directory)
-	{
-		$directory = $this->filesystem->clean_path($directory);
-		$dir_len = strlen($directory);
-
-		if ($dir_len > 1 && $directory[$dir_len - 1] === '/')
-		{
-			$directory = substr($directory, 0, -1);
-		}
-
-		return $directory;
-	}
-
-	/**
-	* Finds classes matching the configured options if they follow phpBB naming rules.
-	*
-	* The php file extension is automatically added to suffixes.
-	*
-	* Note: If a file is matched but contains a class name not following the
-	* phpBB naming rules an incorrect class name will be returned.
-	*
-	* @param bool $cache Whether the result should be cached
-	* @param bool $use_all_available Use all available instead of just all
-	* 						enabled extensions
-	* @return array An array of found class names
-	*/
-	public function get_classes($cache = true, $use_all_available = false)
-	{
-		$this->query['extension_suffix'] .= '.' . $this->php_ext;
-		$this->query['core_suffix'] .= '.' . $this->php_ext;
-
-		$files = $this->find($cache, false, $use_all_available);
-
-		return $this->get_classes_from_files($files);
-	}
-
-	/**
-	* Get class names from a list of files
-	*
-	* @param array $files Array of files (from find())
-	* @return array Array of class names
-	*/
-	public function get_classes_from_files($files)
-	{
-		$classes = array();
-		foreach ($files as $file => $ext_name)
-		{
-			$class = substr($file, 0, -strlen('.' . $this->php_ext));
-			if ($ext_name === '/' && preg_match('#^includes/#', $file))
-			{
-				$class = preg_replace('#^includes/#', '', $class);
-				$classes[] = 'phpbb_' . str_replace('/', '_', $class);
-			}
-			else
-			{
-				$class = preg_replace('#^ext/#', '', $class);
-				$classes[] = '\\' . str_replace('/', '\\', $class);
-			}
-		}
-		return $classes;
-	}
-
-	/**
-	* Finds all directories matching the configured options
-	*
-	* @param bool $cache Whether the result should be cached
-	* @param bool $use_all_available Use all available instead of just all
-	* 						enabled extensions
-	* @param bool $extension_keys Whether the result should have extension name as array key
-	* @return array An array of paths to found directories
-	*/
-	public function get_directories($cache = true, $use_all_available = false, $extension_keys = false)
-	{
-		return $this->find_with_root_path($cache, true, $use_all_available, $extension_keys);
-	}
-
-	/**
-	* Finds all files matching the configured options.
-	*
-	* @param bool $cache Whether the result should be cached
-	* @param bool $use_all_available Use all available instead of just all
-	* 						enabled extensions
-	* @return array An array of paths to found files
-	*/
-	public function get_files($cache = true, $use_all_available = false)
-	{
-		return $this->find_with_root_path($cache, false, $use_all_available);
-	}
-
-	/**
-	* A wrapper around the general find which prepends a root path to results
-	*
-	* @param bool $cache Whether the result should be cached
-	* @param bool $is_dir Directories will be returned when true, only files
-	*                     otherwise
-	* @param bool $use_all_available Use all available instead of just all
-	* 						enabled extensions
-	* @param bool $extension_keys If true, result will be associative array
-	*					with extension name as key
-	* @return array An array of paths to found items
-	*/
-	protected function find_with_root_path($cache = true, $is_dir = false, $use_all_available = false, $extension_keys = false)
-	{
-		$items = $this->find($cache, $is_dir, $use_all_available);
-
-		$result = array();
-		foreach ($items as $item => $ext_name)
-		{
-			if ($extension_keys)
-			{
-				$result[$ext_name] = $this->phpbb_root_path . $item;
-			}
-			else
-			{
-				$result[] = $this->phpbb_root_path . $item;
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	* Finds all file system entries matching the configured options
-	*
-	* @param bool $cache Whether the result should be cached
-	* @param bool $is_dir Directories will be returned when true, only files
-	*                     otherwise
-	* @param bool $use_all_available Use all available instead of just all
-	* 						enabled extensions
-	* @return array An array of paths to found items
-	*/
-	public function find($cache = true, $is_dir = false, $use_all_available = false)
-	{
-		if ($use_all_available)
-		{
-			$extensions = $this->extension_manager->all_available();
-		}
-		else
-		{
-			$extensions = $this->extension_manager->all_enabled();
-		}
-
-		if ($this->query['core_path'])
-		{
-			$extensions['/'] = $this->phpbb_root_path . $this->query['core_path'];
-		}
-
-		$files = array();
-		$file_list = $this->find_from_paths($extensions, $cache, $is_dir);
-
-		foreach ($file_list as $file)
-		{
-			$files[$file['named_path']] = $file['ext_name'];
-		}
-
-		return $files;
-	}
-
-	/**
-	* Finds all file system entries matching the configured options for one
-	* specific extension
-	*
-	* @param string $extension_name Name of the extension
-	* @param string $extension_path Relative path to the extension root directory
-	* @param bool $cache Whether the result should be cached
-	* @param bool $is_dir Directories will be returned when true, only files
-	*                     otherwise
-	* @return array An array of paths to found items
-	*/
-	public function find_from_extension($extension_name, $extension_path, $cache = true, $is_dir = false)
-	{
-		$extensions = array(
-			$extension_name => $extension_path,
-		);
-
-		$files = array();
-		$file_list = $this->find_from_paths($extensions, $cache, $is_dir);
-
-		foreach ($file_list as $file)
-		{
-			$files[$file['named_path']] = $file['ext_name'];
-		}
-
-		return $files;
-	}
-
-	/**
-	* Finds all file system entries matching the configured options from
-	* an array of paths
-	*
-	* @param array $extensions Array of extensions (name => full relative path)
-	* @param bool $cache Whether the result should be cached
-	* @param bool $is_dir Directories will be returned when true, only files
-	*                     otherwise
-	* @return array An array of paths to found items
-	*/
-	public function find_from_paths($extensions, $cache = true, $is_dir = false)
-	{
-		$this->query['is_dir'] = $is_dir;
-		$query = md5(serialize($this->query) . serialize($extensions));
-
-		if (!defined('DEBUG') && $cache && isset($this->cached_queries[$query]))
-		{
-			return $this->cached_queries[$query];
-		}
-
-		$files = array();
-
-		foreach ($extensions as $name => $path)
-		{
-			$ext_name = $name;
-
-			if (!file_exists($path))
-			{
-				continue;
-			}
-
-			if ($name === '/')
-			{
-				$location = $this->query['core_path'];
-				$name = '';
-				$suffix = $this->query['core_suffix'];
-				$prefix = $this->query['core_prefix'];
-				$directory = $this->query['core_directory'];
-			}
-			else
-			{
-				$location = 'ext/';
-				$name .= '/';
-				$suffix = $this->query['extension_suffix'];
-				$prefix = $this->query['extension_prefix'];
-				$directory = $this->query['extension_directory'];
-			}
-
-			// match only first directory if leading slash is given
-			if ($directory === '/')
-			{
-				$directory_pattern = '^' . preg_quote(DIRECTORY_SEPARATOR, '#');
-			}
-			else if ($directory && $directory[0] === '/')
-			{
-				$directory_pattern = '^' . preg_quote(str_replace('/', DIRECTORY_SEPARATOR, $directory) . DIRECTORY_SEPARATOR, '#');
-			}
-			else
-			{
-				$directory_pattern = preg_quote(DIRECTORY_SEPARATOR . str_replace('/', DIRECTORY_SEPARATOR, $directory) . DIRECTORY_SEPARATOR, '#');
-			}
-			if ($is_dir)
-			{
-				$directory_pattern .= '$';
-			}
-			$directory_pattern = '#' . $directory_pattern . '#';
-
-			$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path), \RecursiveIteratorIterator::SELF_FIRST);
-			foreach ($iterator as $file_info)
-			{
-				$filename = $file_info->getFilename();
-				if ($filename == '.' || $filename == '..')
-				{
-					continue;
-				}
-
-				if ($file_info->isDir() == $is_dir)
-				{
-					if ($is_dir)
-					{
-						$relative_path = $iterator->getInnerIterator()->getSubPath() . DIRECTORY_SEPARATOR . basename($filename) . DIRECTORY_SEPARATOR;
-						if ($relative_path[0] !== DIRECTORY_SEPARATOR)
-						{
-							$relative_path = DIRECTORY_SEPARATOR . $relative_path;
-						}
-					}
-					else
-					{
-						$relative_path = DIRECTORY_SEPARATOR . $iterator->getInnerIterator()->getSubPathname();
-					}
-
-					if ((!$suffix || substr($relative_path, -strlen($suffix)) === $suffix) &&
-						(!$prefix || substr($filename, 0, strlen($prefix)) === $prefix) &&
-						(!$directory || preg_match($directory_pattern, $relative_path)))
-					{
-						$files[] = array(
-							'named_path'	=> str_replace(DIRECTORY_SEPARATOR, '/', $location . $name . substr($relative_path, 1)),
-							'ext_name'		=> $ext_name,
-							'path'			=> str_replace(array(DIRECTORY_SEPARATOR, $this->phpbb_root_path), array('/', ''), $file_info->getPath()) . '/',
-							'filename'		=> $filename,
-						);
-					}
-				}
-			}
-		}
-
-		if ($cache && $this->cache)
-		{
-			$this->cached_queries[$query] = $files;
-			$this->cache->put($this->cache_name, $this->cached_queries);
-		}
-
-		return $files;
-	}
-}
diff --git a/phpBB/phpbb/extension/manager.php b/phpBB/phpbb/extension/manager.php
index 23b281deaa..98d2d27278 100644
--- a/phpBB/phpbb/extension/manager.php
+++ b/phpBB/phpbb/extension/manager.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package extension
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
 */
 
@@ -13,8 +17,6 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
 * The extension manager provides means to activate/deactivate extensions.
-*
-* @package extension
 */
 class manager
 {
@@ -34,26 +36,26 @@ class manager
 	* Creates a manager and loads information from database
 	*
 	* @param ContainerInterface $container A container
-	* @param \phpbb\db\driver\driver $db A database connection
-	* @param \phpbb\config\config $config \phpbb\config\config
-	* @param \phpbb\filesystem $filesystem
+	* @param \phpbb\db\driver\driver_interface $db A database connection
+	* @param \phpbb\config\config $config Config object
+	* @param \phpbb\filesystem\filesystem_interface $filesystem
 	* @param string $extension_table The name of the table holding extensions
 	* @param string $phpbb_root_path Path to the phpbb includes directory.
-	* @param string $php_ext php file extension
+	* @param string $php_ext php file extension, defaults to php
 	* @param \phpbb\cache\driver\driver_interface $cache A cache instance or null
 	* @param string $cache_name The name of the cache variable, defaults to _ext
 	*/
-	public function __construct(ContainerInterface $container, \phpbb\db\driver\driver $db, \phpbb\config\config $config, \phpbb\filesystem $filesystem, $extension_table, $phpbb_root_path, $php_ext = 'php', \phpbb\cache\driver\driver_interface $cache = null, $cache_name = '_ext')
+	public function __construct(ContainerInterface $container, \phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\filesystem\filesystem_interface $filesystem, $extension_table, $phpbb_root_path, $php_ext = 'php', \phpbb\cache\driver\driver_interface $cache = null, $cache_name = '_ext')
 	{
+		$this->cache = $cache;
+		$this->cache_name = $cache_name;
+		$this->config = $config;
 		$this->container = $container;
-		$this->phpbb_root_path = $phpbb_root_path;
 		$this->db = $db;
-		$this->config = $config;
-		$this->cache = $cache;
+		$this->extension_table = $extension_table;
 		$this->filesystem = $filesystem;
+		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
-		$this->extension_table = $extension_table;
-		$this->cache_name = $cache_name;
 
 		$this->extensions = ($this->cache) ? $this->cache->get($this->cache_name) : false;
 
@@ -72,11 +74,12 @@ class manager
 	{
 		$this->extensions = array();
 
-		// Do not try to load any extensions when installing or updating
+		// Do not try to load any extensions if the extension table
+		// does not exist or when installing or updating.
 		// Note: database updater invokes this code, and in 3.0
 		// there is no extension table therefore the rest of this function
 		// fails
-		if (defined('IN_INSTALL'))
+		if (defined('IN_INSTALL') || version_compare($this->config['version'], '3.1.0-dev', '<'))
 		{
 			return;
 		}
@@ -143,7 +146,7 @@ class manager
 	* Instantiates the metadata manager for the extension with the given name
 	*
 	* @param string $name The extension name
-	* @param string $template The template manager
+	* @param \phpbb\template\template $template The template manager
 	* @return \phpbb\extension\metadata_manager Instance of the metadata manager
 	*/
 	public function create_extension_metadata_manager($name, \phpbb\template\template $template)
@@ -172,6 +175,12 @@ class manager
 		$old_state = (isset($this->extensions[$name]['ext_state'])) ? unserialize($this->extensions[$name]['ext_state']) : false;
 
 		$extension = $this->get_extension($name);
+
+		if (!$extension->is_enableable())
+		{
+			return false;
+		}
+
 		$state = $extension->enable_step($old_state);
 
 		$active = ($state === false);
@@ -212,6 +221,11 @@ class manager
 			$this->cache->purge();
 		}
 
+		if ($active)
+		{
+			$this->config->increment('assets_version', 1);
+		}
+
 		return !$active;
 	}
 
@@ -404,11 +418,16 @@ class manager
 		}
 
 		$iterator = new \RecursiveIteratorIterator(
-			new \RecursiveDirectoryIterator($this->phpbb_root_path . 'ext/', \FilesystemIterator::NEW_CURRENT_AND_KEY | \FilesystemIterator::FOLLOW_SYMLINKS),
-			\RecursiveIteratorIterator::SELF_FIRST);
+			new \phpbb\recursive_dot_prefix_filter_iterator(
+				new \RecursiveDirectoryIterator($this->phpbb_root_path . 'ext/', \FilesystemIterator::NEW_CURRENT_AND_KEY | \FilesystemIterator::FOLLOW_SYMLINKS)
+			),
+			\RecursiveIteratorIterator::SELF_FIRST
+		);
+		$iterator->setMaxDepth(2);
+
 		foreach ($iterator as $file_info)
 		{
-			if ($file_info->isFile() && $file_info->getFilename() == 'ext.' . $this->php_ext)
+			if ($file_info->isFile() && $file_info->getFilename() == 'composer.json')
 			{
 				$ext_name = $iterator->getInnerIterator()->getSubPath();
 				$composer_file = $iterator->getPath() . '/composer.json';
@@ -442,15 +461,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;
@@ -458,18 +479,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;
@@ -478,17 +500,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;
@@ -500,7 +524,7 @@ class manager
 	* @param string $name Extension name to check NOTE: Can be user input
 	* @return bool Depending on whether or not the extension is available
 	*/
-	public function available($name)
+	public function is_available($name)
 	{
 		return file_exists($this->get_extension_path($name, true));
 	}
@@ -511,18 +535,66 @@ class manager
 	* @param string $name Extension name to check
 	* @return bool Depending on whether or not the extension is enabled
 	*/
-	public function enabled($name)
+	public function is_enabled($name)
 	{
 		return isset($this->extensions[$name]) && $this->extensions[$name]['ext_active'];
 	}
 
 	/**
-	* Instantiates a \phpbb\extension\finder.
+	* Check to see if a given extension is disabled
+	*
+	* @param string $name Extension name to check
+	* @return bool Depending on whether or not the extension is disabled
+	*/
+	public function is_disabled($name)
+	{
+		return isset($this->extensions[$name]) && !$this->extensions[$name]['ext_active'];
+	}
+
+	/**
+	* Check to see if a given extension is configured
 	*
-	* @return \phpbb\extension\finder An extension finder instance
+	* All enabled and disabled extensions are considered configured. A purged
+	* extension that is no longer in the database is not configured.
+	*
+	* @param string $name Extension name to check
+	* @return bool Depending on whether or not the extension is configured
 	*/
-	public function get_finder()
+	public function is_configured($name)
 	{
-		return new \phpbb\extension\finder($this, $this->filesystem, $this->phpbb_root_path, $this->cache, $this->php_ext, $this->cache_name . '_finder');
+		return isset($this->extensions[$name]);
+	}
+
+	/**
+	* Check to see if a given extension is purged
+	*
+	* An extension is purged if it is available, not enabled and not disabled.
+	*
+	* @param string $name Extension name to check
+	* @return bool Depending on whether or not the extension is purged
+	*/
+	public function is_purged($name)
+	{
+		return $this->is_available($name) && !$this->is_configured($name);
+	}
+
+	/**
+	* Instantiates a \phpbb\finder.
+	*
+	* @param bool $use_all_available Should we load all extensions, or just enabled ones
+	* @return \phpbb\finder An extension finder instance
+	*/
+	public function get_finder($use_all_available = false)
+	{
+		$finder = new \phpbb\finder($this->filesystem, $this->phpbb_root_path, $this->cache, $this->php_ext, $this->cache_name . '_finder');
+		if ($use_all_available)
+		{
+			$finder->set_extensions(array_keys($this->all_available()));
+		}
+		else
+		{
+			$finder->set_extensions(array_keys($this->all_enabled()));
+		}
+		return $finder;
 	}
 }
diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php
index 66cdb86513..4f080647c8 100644
--- a/phpBB/phpbb/extension/metadata_manager.php
+++ b/phpBB/phpbb/extension/metadata_manager.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package extension
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
 */
 
@@ -11,8 +15,6 @@ namespace phpbb\extension;
 
 /**
 * The extension metadata manager validates and gets meta-data for extensions
-*
-* @package extension
 */
 class metadata_manager
 {
@@ -63,8 +65,8 @@ class metadata_manager
 	*
 	* @param string				$ext_name			Name (including vendor) of the extension
 	* @param \phpbb\config\config		$config				phpBB Config instance
-	* @param \phpbb\extension\manager	$extension_manager An instance of the phpBBb extension manager
-	* @param \phpbb\template\template		$template			phpBB Template instance
+	* @param \phpbb\extension\manager	$extension_manager	An instance of the phpBB extension manager
+	* @param \phpbb\template\template	$template			phpBB Template instance
 	* @param string				$phpbb_root_path	Path to the phpbb includes directory.
 	*/
 	public function __construct($ext_name, \phpbb\config\config $config, \phpbb\extension\manager $extension_manager, \phpbb\template\template $template, $phpbb_root_path)
@@ -80,11 +82,11 @@ class metadata_manager
 	}
 
 	/**
-	 * Processes and gets the metadata requested
-	 *
-	 * @param  string $element			All for all metadata that it has and is valid, otherwise specify which section you want by its shorthand term.
-	 * @return array					Contains all of the requested metadata, throws an exception on failure
-	 */
+	* Processes and gets the metadata requested
+	*
+	* @param  string $element			All for all metadata that it has and is valid, otherwise specify which section you want by its shorthand term.
+	* @return array					Contains all of the requested metadata, throws an exception on failure
+	*/
 	public function get_metadata($element = 'all')
 	{
 		$this->set_metadata_file();
@@ -126,10 +128,10 @@ class metadata_manager
 	}
 
 	/**
-	 * Sets the filepath of the metadata file
-	 *
-	 * @return boolean  Set to true if it exists, throws an exception on failure
-	 */
+	* Sets the filepath of the metadata file
+	*
+	* @throws \phpbb\extension\exception
+	*/
 	private function set_metadata_file()
 	{
 		$ext_filepath = $this->extension_manager->get_extension_path($this->ext_name);
@@ -139,33 +141,35 @@ class metadata_manager
 
 		if (!file_exists($this->metadata_file))
 		{
-			throw new \phpbb\extension\exception('The required file does not exist: ' . $this->metadata_file);
+			throw new \phpbb\extension\exception('FILE_NOT_FOUND', array($this->metadata_file));
 		}
 	}
 
 	/**
-	 * Gets the contents of the composer.json file
-	 *
-	 * @return bool True if success, throws an exception on failure
-	 */
+	* Gets the contents of the composer.json file
+	*
+	* @return bool True if success, throws an exception on failure
+	* @throws \phpbb\extension\exception
+	*/
 	private function fetch_metadata()
 	{
 		if (!file_exists($this->metadata_file))
 		{
-			throw new \phpbb\extension\exception('The required file does not exist: ' . $this->metadata_file);
+			throw new \phpbb\extension\exception('FILE_NOT_FOUND', array($this->metadata_file));
 		}
 		else
 		{
 			if (!($file_contents = file_get_contents($this->metadata_file)))
 			{
-				throw new \phpbb\extension\exception('file_get_contents failed on ' . $this->metadata_file);
+				throw new \phpbb\extension\exception('FILE_CONTENT_ERR', array($this->metadata_file));
 			}
 
 			if (($metadata = json_decode($file_contents, true)) === null)
 			{
-				throw new \phpbb\extension\exception('json_decode failed on ' . $this->metadata_file);
+				throw new \phpbb\extension\exception('FILE_JSON_DECODE_ERR', array($this->metadata_file));
 			}
 
+			array_walk_recursive($metadata, array($this, 'sanitize_json'));
 			$this->metadata = $metadata;
 
 			return true;
@@ -173,10 +177,21 @@ class metadata_manager
 	}
 
 	/**
-	 * This array handles the cleaning of the array
+	 * Sanitize input from JSON array using htmlspecialchars()
 	 *
-	 * @return array Contains the cleaned metadata array
+	 * @param mixed		$value	Value of array row
+	 * @param string	$key	Key of array row
 	 */
+	public function sanitize_json(&$value, $key)
+	{
+		$value = htmlspecialchars($value);
+	}
+
+	/**
+	* This array handles the cleaning of the array
+	*
+	* @return array Contains the cleaned metadata array
+	*/
 	private function clean_metadata_array()
 	{
 		return $this->metadata;
@@ -189,6 +204,7 @@ class metadata_manager
 	* 						"display" for name, type, and authors
 	* 						"name", "type")
 	* @return Bool True if valid, throws an exception if invalid
+	* @throws \phpbb\extension\exception
 	*/
 	public function validate($name = 'display')
 	{
@@ -196,7 +212,7 @@ class metadata_manager
 		$fields = array(
 			'name'		=> '#^[a-zA-Z0-9_\x7f-\xff]{2,}/[a-zA-Z0-9_\x7f-\xff]{2,}$#',
 			'type'		=> '#^phpbb-extension$#',
-			'licence'	=> '#.+#',
+			'license'	=> '#.+#',
 			'version'	=> '#.+#',
 		);
 
@@ -222,12 +238,12 @@ class metadata_manager
 				{
 					if (!isset($this->metadata[$name]))
 					{
-						throw new \phpbb\extension\exception("Required meta field '$name' has not been set.");
+						throw new \phpbb\extension\exception('META_FIELD_NOT_SET', array($name));
 					}
 
 					if (!preg_match($fields[$name], $this->metadata[$name]))
 					{
-						throw new \phpbb\extension\exception("Meta field '$name' is invalid.");
+						throw new \phpbb\extension\exception('META_FIELD_INVALID', array($name));
 					}
 				}
 			break;
@@ -237,22 +253,23 @@ class metadata_manager
 	}
 
 	/**
-	 * Validates the contents of the authors field
-	 *
-	 * @return boolean True when passes validation, throws exception if invalid
-	 */
+	* Validates the contents of the authors field
+	*
+	* @return boolean True when passes validation, throws exception if invalid
+	* @throws \phpbb\extension\exception
+	*/
 	public function validate_authors()
 	{
 		if (empty($this->metadata['authors']))
 		{
-			throw new \phpbb\extension\exception("Required meta field 'authors' has not been set.");
+			throw new \phpbb\extension\exception('META_FIELD_NOT_SET', array('authors'));
 		}
 
 		foreach ($this->metadata['authors'] as $author)
 		{
 			if (!isset($author['name']))
 			{
-				throw new \phpbb\extension\exception("Required meta field 'author name' has not been set.");
+				throw new \phpbb\extension\exception('META_FIELD_NOT_SET', array('author name'));
 			}
 		}
 
@@ -260,10 +277,10 @@ class metadata_manager
 	}
 
 	/**
-	 * This array handles the verification that this extension can be enabled on this board
-	 *
-	 * @return bool True if validation succeeded, False if failed
-	 */
+	* This array handles the verification that this extension can be enabled on this board
+	*
+	* @return bool True if validation succeeded, False if failed
+	*/
 	public function validate_enable()
 	{
 		// Check for valid directory & phpBB, PHP versions
@@ -276,10 +293,10 @@ class metadata_manager
 	}
 
 	/**
-	 * Validates the most basic directory structure to ensure it follows <vendor>/<ext> convention.
-	 *
-	 * @return boolean True when passes validation
-	 */
+	* Validates the most basic directory structure to ensure it follows <vendor>/<ext> convention.
+	*
+	* @return boolean True when passes validation
+	*/
 	public function validate_dir()
 	{
 		return (substr_count($this->ext_name, '/') === 1 && $this->ext_name == $this->get_metadata('name'));
@@ -287,13 +304,13 @@ class metadata_manager
 
 
 	/**
-	 * Validates the contents of the phpbb requirement field
-	 *
-	 * @return boolean True when passes validation
-	 */
+	* Validates the contents of the phpbb requirement field
+	*
+	* @return boolean True when passes validation
+	*/
 	public function validate_require_phpbb()
 	{
-		if (!isset($this->metadata['require']['phpbb/phpbb']))
+		if (!isset($this->metadata['extra']['soft-require']['phpbb/phpbb']))
 		{
 			return false;
 		}
@@ -302,10 +319,10 @@ class metadata_manager
 	}
 
 	/**
-	 * Validates the contents of the php requirement field
-	 *
-	 * @return boolean True when passes validation
-	 */
+	* Validates the contents of the php requirement field
+	*
+	* @return boolean True when passes validation
+	*/
 	public function validate_require_php()
 	{
 		if (!isset($this->metadata['require']['php']))
@@ -317,58 +334,37 @@ class metadata_manager
 	}
 
 	/**
-	* Version validation helper
+	* Outputs the metadata into the template
 	*
-	* @param string $string The string for comparing to a version
-	* @param string $current_version The version to compare to
-	* @return bool True/False if meets version requirements
+	* @return null
 	*/
-	private function _validate_version($string, $current_version)
-	{
-		// Allow them to specify their own comparison operator (ex: <3.1.2, >=3.1.0)
-		$comparison_matches = false;
-		preg_match('#[=<>]+#', $string, $comparison_matches);
-
-		if (!empty($comparison_matches))
-		{
-			return version_compare($current_version, str_replace(array($comparison_matches[0], ' '), '', $string), $comparison_matches[0]);
-		}
-
-		return version_compare($current_version, $string, '>=');
-	}
-
-	/**
-	 * Outputs the metadata into the template
-	 *
-	 * @return null
-	 */
 	public function output_template_data()
 	{
 		$this->template->assign_vars(array(
-			'META_NAME'			=> htmlspecialchars($this->metadata['name']),
-			'META_TYPE'			=> htmlspecialchars($this->metadata['type']),
-			'META_DESCRIPTION'	=> (isset($this->metadata['description'])) ? htmlspecialchars($this->metadata['description']) : '',
+			'META_NAME'			=> $this->metadata['name'],
+			'META_TYPE'			=> $this->metadata['type'],
+			'META_DESCRIPTION'	=> (isset($this->metadata['description'])) ? $this->metadata['description'] : '',
 			'META_HOMEPAGE'		=> (isset($this->metadata['homepage'])) ? $this->metadata['homepage'] : '',
-			'META_VERSION'		=> (isset($this->metadata['version'])) ? htmlspecialchars($this->metadata['version']) : '',
-			'META_TIME'			=> (isset($this->metadata['time'])) ? htmlspecialchars($this->metadata['time']) : '',
-			'META_LICENCE'		=> htmlspecialchars($this->metadata['licence']),
+			'META_VERSION'		=> (isset($this->metadata['version'])) ? $this->metadata['version'] : '',
+			'META_TIME'			=> (isset($this->metadata['time'])) ? $this->metadata['time'] : '',
+			'META_LICENSE'		=> $this->metadata['license'],
 
-			'META_REQUIRE_PHP'		=> (isset($this->metadata['require']['php'])) ? htmlspecialchars($this->metadata['require']['php']) : '',
+			'META_REQUIRE_PHP'		=> (isset($this->metadata['require']['php'])) ? $this->metadata['require']['php'] : '',
 			'META_REQUIRE_PHP_FAIL'	=> !$this->validate_require_php(),
 
-			'META_REQUIRE_PHPBB'		=> (isset($this->metadata['require']['phpbb/phpbb'])) ? htmlspecialchars($this->metadata['require']['phpbb/phpbb']) : '',
+			'META_REQUIRE_PHPBB'		=> (isset($this->metadata['extra']['soft-require']['phpbb/phpbb'])) ? $this->metadata['extra']['soft-require']['phpbb/phpbb'] : '',
 			'META_REQUIRE_PHPBB_FAIL'	=> !$this->validate_require_phpbb(),
 
-			'META_DISPLAY_NAME'	=> (isset($this->metadata['extra']['display-name'])) ? htmlspecialchars($this->metadata['extra']['display-name']) : '',
+			'META_DISPLAY_NAME'	=> (isset($this->metadata['extra']['display-name'])) ? $this->metadata['extra']['display-name'] : '',
 		));
 
 		foreach ($this->metadata['authors'] as $author)
 		{
 			$this->template->assign_block_vars('meta_authors', array(
-				'AUTHOR_NAME'		=> htmlspecialchars($author['name']),
+				'AUTHOR_NAME'		=> $author['name'],
 				'AUTHOR_EMAIL'		=> (isset($author['email'])) ? $author['email'] : '',
 				'AUTHOR_HOMEPAGE'	=> (isset($author['homepage'])) ? $author['homepage'] : '',
-				'AUTHOR_ROLE'		=> (isset($author['role'])) ? htmlspecialchars($author['role']) : '',
+				'AUTHOR_ROLE'		=> (isset($author['role'])) ? $author['role'] : '',
 			));
 		}
 	}
diff --git a/phpBB/phpbb/extension/provider.php b/phpBB/phpbb/extension/provider.php
index bfdc2b66b9..1c42cf7b5e 100644
--- a/phpBB/phpbb/extension/provider.php
+++ b/phpBB/phpbb/extension/provider.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package extension
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
 */
 
@@ -19,8 +23,6 @@ namespace phpbb\extension;
 *
 * Items could be anything, for example template paths or cron task names.
 * Derived classes completely define what the items are.
-*
-* @package extension
 */
 abstract class provider implements \IteratorAggregate
 {
@@ -56,7 +58,7 @@ abstract class provider implements \IteratorAggregate
 	/**
 	* Retrieve an iterator over all items
 	*
-	* @return ArrayIterator An iterator for the array of template paths
+	* @return \ArrayIterator An iterator for the array of template paths
 	*/
 	public function getIterator()
 	{