diff --git a/phpBB/includes/extension/metadata_manager.php b/phpBB/includes/extension/metadata_manager.php
index 1e3bbe48c9..8c570830fe 100644
--- a/phpBB/includes/extension/metadata_manager.php
+++ b/phpBB/includes/extension/metadata_manager.php
@@ -60,7 +60,6 @@ class phpbb_extension_metadata_manager
 	 */
 	public function get_metadata($element = 'all')
 	{
-		// TODO: Check ext_name exists and is an extension that exists
 		$this->set_metadata_file();
 
 		// Fetch the metadata
@@ -339,7 +338,5 @@ class phpbb_extension_metadata_manager
 				'AUTHOR_ROLE'		=> (isset($author['role'])) ? htmlspecialchars($author['role']) : '',
 			));
 		}
-
-		return;
 	}
 }
diff --git a/tests/extension/ext/foo/composer.json b/tests/extension/ext/foo/composer.json
index 4b5150461f..744f7be625 100644
--- a/tests/extension/ext/foo/composer.json
+++ b/tests/extension/ext/foo/composer.json
@@ -4,7 +4,7 @@
 	"description": "An example/sample extension to be used for testing purposes in phpBB Development.",
 	"version": "1.0.0",
 	"time": "2012-02-15 01:01:01",
-	"licence": "GNU GPL v2",
+	"licence": "GPL-2.0",
 	"authors": [{
 			"name": "Nathan Guse",
 			"username": "EXreaction",