7 files changed, 90 insertions, 105 deletions
diff --git a/phpBB/phpbb/extension/base.php b/phpBB/phpbb/extension/base.php
index a529cc7961..1f871750e0 100644
--- a/phpBB/phpbb/extension/base.php
+++ b/phpBB/phpbb/extension/base.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\extension;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
diff --git a/phpBB/phpbb/extension/exception.php b/phpBB/phpbb/extension/exception.php
index e2ba647878..82327c9d5e 100644
--- a/phpBB/phpbb/extension/exception.php
+++ b/phpBB/phpbb/extension/exception.php
@@ -10,14 +10,6 @@
 namespace phpbb\extension;
 
 /**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
  * Exception class for metadata
  */
 class exception extends \UnexpectedValueException
@@ -26,4 +18,4 @@ class exception extends \UnexpectedValueException
 	{
 		return $this->getMessage();
 	}
-}
-\ No newline at end of file
+}
diff --git a/phpBB/phpbb/extension/extension_interface.php b/phpBB/phpbb/extension/extension_interface.php
index 1e5f546dc5..bddff51b5a 100644
--- a/phpBB/phpbb/extension/extension_interface.php
+++ b/phpBB/phpbb/extension/extension_interface.php
@@ -10,14 +10,6 @@
 namespace phpbb\extension;
 
 /**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
 * The interface extension meta classes have to implement to run custom code
 * on enable/disable/purge.
 *
diff --git a/phpBB/phpbb/extension/finder.php b/phpBB/phpbb/extension/finder.php
index e787919588..6cc6e1808a 100644
--- a/phpBB/phpbb/extension/finder.php
+++ b/phpBB/phpbb/extension/finder.php
@@ -10,14 +10,6 @@
 namespace phpbb\extension;
 
 /**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
 * The extension finder provides a simple way to locate files in active extensions
 *
 * @package extension
@@ -483,14 +475,19 @@ class finder
 			}
 			$directory_pattern = '#' . $directory_pattern . '#';
 
-			$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path), \RecursiveIteratorIterator::SELF_FIRST);
+			$iterator = new \RecursiveIteratorIterator(
+				new \phpbb\recursive_dot_prefix_filter_iterator(
+					new \RecursiveDirectoryIterator(
+						$path,
+						\FilesystemIterator::SKIP_DOTS
+					)
+				),
+				\RecursiveIteratorIterator::SELF_FIRST
+			);
+
 			foreach ($iterator as $file_info)
 			{
 				$filename = $file_info->getFilename();
-				if ($filename == '.' || $filename == '..')
-				{
-					continue;
-				}
 
 				if ($file_info->isDir() == $is_dir)
 				{
diff --git a/phpBB/phpbb/extension/manager.php b/phpBB/phpbb/extension/manager.php
index ce6d7e05c8..b22fbf07a6 100644
--- a/phpBB/phpbb/extension/manager.php
+++ b/phpBB/phpbb/extension/manager.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\extension;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -42,7 +34,7 @@ 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\db\driver\driver_interface $db A database connection
 	* @param \phpbb\config\config $config \phpbb\config\config
 	* @param \phpbb\filesystem $filesystem
 	* @param string $extension_table The name of the table holding extensions
@@ -51,7 +43,7 @@ class manager
 	* @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, $extension_table, $phpbb_root_path, $php_ext = 'php', \phpbb\cache\driver\driver_interface $cache = null, $cache_name = '_ext')
 	{
 		$this->container = $container;
 		$this->phpbb_root_path = $phpbb_root_path;
@@ -220,6 +212,11 @@ class manager
 			$this->cache->purge();
 		}
 
+		if ($active)
+		{
+			$this->config->increment('assets_version', 1);
+		}
+
 		return !$active;
 	}
 
@@ -234,7 +231,9 @@ class manager
 	*/
 	public function enable($name)
 	{
+		// @codingStandardsIgnoreStart
 		while ($this->enable_step($name));
+		// @codingStandardsIgnoreEnd
 	}
 
 	/**
@@ -311,7 +310,9 @@ class manager
 	*/
 	public function disable($name)
 	{
+		// @codingStandardsIgnoreStart
 		while ($this->disable_step($name));
+		// @codingStandardsIgnoreEnd
 	}
 
 	/**
@@ -388,7 +389,9 @@ class manager
 	*/
 	public function purge($name)
 	{
+		// @codingStandardsIgnoreStart
 		while ($this->purge_step($name));
+		// @codingStandardsIgnoreEnd
 	}
 
 	/**
@@ -413,9 +416,24 @@ class manager
 			if ($file_info->isFile() && $file_info->getFilename() == 'ext.' . $this->php_ext)
 			{
 				$ext_name = $iterator->getInnerIterator()->getSubPath();
+				$composer_file = $iterator->getPath() . '/composer.json';
 
+				// Ignore the extension if there is no composer.json.
+				if (!is_readable($composer_file) || !($ext_info = file_get_contents($composer_file)))
+				{
+					continue;
+				}
+
+				$ext_info = json_decode($ext_info, true);
 				$ext_name = str_replace(DIRECTORY_SEPARATOR, '/', $ext_name);
 
+				// Ignore the extension if directory depth is not correct or if the directory structure
+				// does not match the name value specified in composer.json.
+				if (substr_count($ext_name, '/') !== 1 || !isset($ext_info['name']) || $ext_name != $ext_info['name'])
+				{
+					continue;
+				}
+
 				$available[$ext_name] = $this->phpbb_root_path . 'ext/' . $ext_name . '/';
 			}
 		}
diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php
index a77f3a2c6e..c90445ee09 100644
--- a/phpBB/phpbb/extension/metadata_manager.php
+++ b/phpBB/phpbb/extension/metadata_manager.php
@@ -10,14 +10,6 @@
 namespace phpbb\extension;
 
 /**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
 * The extension metadata manager validates and gets meta-data for extensions
 *
 * @package extension
@@ -147,7 +139,7 @@ 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('The required file does not exist: ' . $this->metadata_file);
 		}
 	}
 
@@ -166,12 +158,12 @@ class metadata_manager
 		{
 			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_get_contents failed on ' . $this->metadata_file);
 			}
 
-			if (($metadata = json_decode($file_contents, true)) === NULL)
+			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('json_decode failed on ' . $this->metadata_file);
 			}
 
 			$this->metadata = $metadata;
@@ -199,50 +191,50 @@ class metadata_manager
 	* @return Bool True if valid, throws an exception if invalid
 	*/
 	public function validate($name = 'display')
-    {
-    	// Basic fields
-    	$fields = array(
-    		'name'		=> '#^[a-zA-Z0-9_\x7f-\xff]{2,}/[a-zA-Z0-9_\x7f-\xff]{2,}$#',
-    		'type'		=> '#^phpbb3-extension$#',
-    		'licence'	=> '#.+#',
-    		'version'	=> '#.+#',
-    	);
-
-    	switch ($name)
-    	{
-    		case 'all':
-    			$this->validate('display');
+	{
+		// Basic fields
+		$fields = array(
+			'name'		=> '#^[a-zA-Z0-9_\x7f-\xff]{2,}/[a-zA-Z0-9_\x7f-\xff]{2,}$#',
+			'type'		=> '#^phpbb-extension$#',
+			'license'	=> '#.+#',
+			'version'	=> '#.+#',
+		);
+
+		switch ($name)
+		{
+			case 'all':
+				$this->validate('display');
 
 				$this->validate_enable();
-    		break;
+			break;
 
-    		case 'display':
-    			foreach ($fields as $field => $data)
+			case 'display':
+				foreach ($fields as $field => $data)
 				{
 					$this->validate($field);
 				}
 
 				$this->validate_authors();
-    		break;
-
-    		default:
-    			if (isset($fields[$name]))
-    			{
-    				if (!isset($this->metadata[$name]))
-    				{
-    					throw new \phpbb\extension\exception("Required meta field '$name' has not been set.");
+			break;
+
+			default:
+				if (isset($fields[$name]))
+				{
+					if (!isset($this->metadata[$name]))
+					{
+						throw new \phpbb\extension\exception("Required meta field '$name' has not been set.");
 					}
 
 					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 '$name' is invalid.");
 					}
 				}
 			break;
 		}
 
 		return true;
-    }
+	}
 
 	/**
 	 * Validates the contents of the authors field
@@ -253,14 +245,14 @@ class metadata_manager
 	{
 		if (empty($this->metadata['authors']))
 		{
-    		throw new \phpbb\extension\exception("Required meta field 'authors' has not been set.");
+			throw new \phpbb\extension\exception("Required meta field 'authors' has not been set.");
 		}
 
 		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("Required meta field 'author name' has not been set.");
 			}
 		}
 
@@ -274,8 +266,8 @@ class metadata_manager
 	 */
 	public function validate_enable()
 	{
-		// Check for phpBB, PHP versions
-		if (!$this->validate_require_phpbb() || !$this->validate_require_php())
+		// Check for valid directory & phpBB, PHP versions
+		if (!$this->validate_dir() || !$this->validate_require_phpbb() || !$this->validate_require_php())
 		{
 			return false;
 		}
@@ -283,6 +275,16 @@ class metadata_manager
 		return true;
 	}
 
+	/**
+	 * 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'));
+	}
+
 
 	/**
 	 * Validates the contents of the phpbb requirement field
@@ -291,12 +293,12 @@ class metadata_manager
 	 */
 	public function validate_require_phpbb()
 	{
-		if (!isset($this->metadata['require']['phpbb']))
+		if (!isset($this->metadata['require']['phpbb/phpbb']))
 		{
-			return true;
+			return false;
 		}
 
-		return $this->_validate_version($this->metadata['require']['phpbb'], $this->config['version']);
+		return true;
 	}
 
 	/**
@@ -308,10 +310,10 @@ class metadata_manager
 	{
 		if (!isset($this->metadata['require']['php']))
 		{
-			return true;
+			return false;
 		}
 
-		return $this->_validate_version($this->metadata['require']['php'], phpversion());
+		return true;
 	}
 
 	/**
@@ -349,12 +351,12 @@ class metadata_manager
 			'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_LICENSE'		=> htmlspecialchars($this->metadata['license']),
 
 			'META_REQUIRE_PHP'		=> (isset($this->metadata['require']['php'])) ? htmlspecialchars($this->metadata['require']['php']) : '',
 			'META_REQUIRE_PHP_FAIL'	=> !$this->validate_require_php(),
 
-			'META_REQUIRE_PHPBB'		=> (isset($this->metadata['require']['phpbb'])) ? htmlspecialchars($this->metadata['require']['phpbb']) : '',
+			'META_REQUIRE_PHPBB'		=> (isset($this->metadata['require']['phpbb/phpbb'])) ? htmlspecialchars($this->metadata['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']) : '',
diff --git a/phpBB/phpbb/extension/provider.php b/phpBB/phpbb/extension/provider.php
index c2a264d311..bfdc2b66b9 100644
--- a/phpBB/phpbb/extension/provider.php
+++ b/phpBB/phpbb/extension/provider.php
@@ -10,14 +10,6 @@
 namespace phpbb\extension;
 
 /**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
 * Provides a set of items found in extensions.
 *
 * This abstract class is essentially a wrapper around item-specific