6 files changed, 13 insertions, 11 deletions
diff --git a/tests/extension/ext/barfoo/composer.json b/tests/extension/ext/barfoo/composer.json
index 35d5d2a956..d88fd413c9 100644
--- a/tests/extension/ext/barfoo/composer.json
+++ b/tests/extension/ext/barfoo/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",
+	"license": "GNU GPL v2",
 	"authors": [{
 			"name": "John Smith",
 			"username": "JohnSmith27",
diff --git a/tests/extension/ext/vendor/moo/composer.json b/tests/extension/ext/vendor/moo/composer.json
index 901cb7f17a..b8fc544c01 100644
--- a/tests/extension/ext/vendor/moo/composer.json
+++ b/tests/extension/ext/vendor/moo/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",
+	"license": "GNU GPL v2",
 	"authors": [{
 			"name": "John Smith",
 			"username": "JohnSmith27",
diff --git a/tests/extension/ext/vendor2/bar/composer.json b/tests/extension/ext/vendor2/bar/composer.json
index 5d60ec031e..215e7d59db 100644
--- a/tests/extension/ext/vendor2/bar/composer.json
+++ b/tests/extension/ext/vendor2/bar/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": "GPL-2.0",
+	"license": "GPL-2.0",
 	"authors": [{
 			"name": "John Smith",
 			"email": "email@phpbb.com",
diff --git a/tests/extension/ext/vendor2/foo/composer.json b/tests/extension/ext/vendor2/foo/composer.json
index 8821d9d50e..7b2a80f5d3 100644
--- a/tests/extension/ext/vendor2/foo/composer.json
+++ b/tests/extension/ext/vendor2/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": "GPL-2.0",
+	"license": "GPL-2.0",
 	"authors": [{
 			"name": "John Smith",
 			"email": "email@phpbb.com",
diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index a3c4cc89e9..a3584be67b 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -148,13 +148,13 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 
 		try
 		{
-			$manager->validate('licence');
+			$manager->validate('license');
 
 			$this->fail('Exception not triggered');
 		}
 		catch(\phpbb\extension\exception $e)
 		{
-			$this->assertEquals((string) $e, 'Required meta field \'licence\' has not been set.');
+			$this->assertEquals((string) $e, 'Required meta field \'license\' has not been set.');
 		}
 
 		try
@@ -208,7 +208,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 		$manager->set_metadata(array(
 			'name'		=> 'asdf',
 			'type'		=> 'asdf',
-			'licence'	=> '',
+			'license'	=> '',
 			'version'	=> '',
 		));
 
@@ -236,13 +236,13 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 
 		try
 		{
-			$manager->validate('licence');
+			$manager->validate('license');
 
 			$this->fail('Exception not triggered');
 		}
 		catch(\phpbb\extension\exception $e)
 		{
-			$this->assertEquals((string) $e, 'Meta field \'licence\' is invalid.');
+			$this->assertEquals((string) $e, 'Meta field \'license\' is invalid.');
 		}
 
 		try
@@ -267,7 +267,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 		$manager->set_metadata(array(
 			'name'		=> 'test/foo',
 			'type'		=> 'phpbb-extension',
-			'licence'	=> 'GPL v2',
+			'license'	=> 'GPL v2',
 			'version'	=> '1.0.0',
 		));
 
diff --git a/tests/extension/modules_test.php b/tests/extension/modules_test.php
index c0a136e173..e396b7b73e 100644
--- a/tests/extension/modules_test.php
+++ b/tests/extension/modules_test.php
@@ -209,7 +209,7 @@ class phpbb_extension_modules_test extends phpbb_test_case
 	*/
 	public function test_modules_auth($module_auth, $expected)
 	{
-		global $phpbb_extension_manager;
+		global $phpbb_extension_manager, $phpbb_dispatcher;
 
 		$phpbb_extension_manager = $this->extension_manager = new phpbb_mock_extension_manager(
 			dirname(__FILE__) . '/',
@@ -227,6 +227,8 @@ class phpbb_extension_modules_test extends phpbb_test_case
 			)
 		);
 
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+
 		$this->assertEquals($expected, p_master::module_auth($module_auth, 0));
 	}
 }