6 files changed, 29 insertions, 15 deletions
diff --git a/tests/extension/ext/barfoo/composer.json b/tests/extension/ext/barfoo/composer.json
index d88fd413c9..bbd76ae143 100644
--- a/tests/extension/ext/barfoo/composer.json
+++ b/tests/extension/ext/barfoo/composer.json
@@ -13,10 +13,10 @@
 			"role": "N/A"
 		}],
 	"require": {
-		"php": ">=5.3",
-		"phpbb/phpbb": "3.1.*@dev"
+		"php": ">=5.3"
 	},
 	"extra": {
-		"display-name": "phpBB BarFoo Extension"
+		"display-name": "phpBB BarFoo Extension",
+		"phpbb/phpbb": "3.1.*@dev"
 	}
 }
diff --git a/tests/extension/ext/vendor/moo/composer.json b/tests/extension/ext/vendor/moo/composer.json
index b8fc544c01..4ad91627d5 100644
--- a/tests/extension/ext/vendor/moo/composer.json
+++ b/tests/extension/ext/vendor/moo/composer.json
@@ -13,10 +13,10 @@
 			"role": "N/A"
 		}],
 	"require": {
-		"php": ">=5.3",
-		"phpbb/phpbb": "3.1.*@dev"
+		"php": ">=5.3"
 	},
 	"extra": {
-		"display-name": "phpBB Moo Extension"
+		"display-name": "phpBB Moo Extension",
+		"phpbb/phpbb": "3.1.*@dev"
 	}
 }
diff --git a/tests/extension/ext/vendor2/bar/composer.json b/tests/extension/ext/vendor2/bar/composer.json
index 215e7d59db..39c0560c36 100644
--- a/tests/extension/ext/vendor2/bar/composer.json
+++ b/tests/extension/ext/vendor2/bar/composer.json
@@ -12,10 +12,10 @@
 			"role": "N/A"
 		}],
 	"require": {
-		"php": ">=5.3",
-		"phpbb/phpbb": "3.1.*@dev"
+		"php": ">=5.3"
 	},
 	"extra": {
-		"display-name": "phpBB Bar Extension"
+		"display-name": "phpBB Bar Extension",
+		"phpbb/phpbb": "3.1.*@dev"
 	}
 }
diff --git a/tests/extension/ext/vendor2/foo/composer.json b/tests/extension/ext/vendor2/foo/composer.json
index 7b2a80f5d3..9ce7068afd 100644
--- a/tests/extension/ext/vendor2/foo/composer.json
+++ b/tests/extension/ext/vendor2/foo/composer.json
@@ -12,10 +12,10 @@
 			"role": "N/A"
 		}],
 	"require": {
-		"php": ">=5.3",
-		"phpbb/phpbb": "3.1.*@dev"
+		"php": ">=5.3"
 	},
 	"extra": {
-		"display-name": "phpBB Foo Extension"
+		"display-name": "phpBB Foo Extension",
+		"phpbb/phpbb": "3.1.*@dev"
 	}
 }
diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index 3678ac0a3f..dc9b0c28df 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -296,6 +296,8 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 		$manager->merge_metadata(array(
 			'require'		=> array(
 				'php'		=> '10.0.0',
+			),
+			'extra'		=> array(
 				'phpbb/phpbb'		=> '3.2.0', // config is set to 3.1.0
 			),
 		));
@@ -315,6 +317,8 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 		$manager->merge_metadata(array(
 			'require'		=> array(
 				'php'		=> '5.3.0',
+			),
+			'extra'		=> array(
 				'phpbb/phpbb'		=> '3.1.0-beta', // config is set to 3.1.0
 			),
 		));
@@ -334,6 +338,8 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 		$manager->merge_metadata(array(
 			'require'		=> array(
 				'php'		=> '>' . phpversion(),
+			),
+			'extra'		=> array(
 				'phpbb/phpbb'		=> '>3.1.0', // config is set to 3.1.0
 			),
 		));
@@ -353,6 +359,8 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 		$manager->merge_metadata(array(
 			'require'		=> array(
 				'php'		=> '<' . phpversion(),
+			),
+			'extra'		=> array(
 				'phpbb/phpbb'		=> '<3.1.0', // config is set to 3.1.0
 			),
 		));
@@ -372,6 +380,8 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 		$manager->merge_metadata(array(
 			'require'		=> array(
 				'php'		=> phpversion(),
+			),
+			'extra'		=> array(
 				'phpbb/phpbb'		=> '3.1.0', // config is set to 3.1.0
 			),
 		));
@@ -391,6 +401,8 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 		$manager->merge_metadata(array(
 			'require'		=> array(
 				'php'		=> '>=' . phpversion(),
+			),
+			'extra'		=> array(
 				'phpbb/phpbb'		=> '>=3.1.0', // config is set to 3.1.0
 			),
 		));
@@ -410,6 +422,8 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 		$manager->merge_metadata(array(
 			'require'		=> array(
 				'php'		=> '<=' . phpversion(),
+			),
+			'extra'		=> array(
 				'phpbb/phpbb'		=> '<=3.1.0', // config is set to 3.1.0
 			),
 		));
diff --git a/tests/functional/fixtures/ext/foo/bar/composer.json b/tests/functional/fixtures/ext/foo/bar/composer.json
index 2f91426d2a..3e8e98e9bd 100644
--- a/tests/functional/fixtures/ext/foo/bar/composer.json
+++ b/tests/functional/fixtures/ext/foo/bar/composer.json
@@ -13,10 +13,10 @@
 		"role": "Developer"
 	}],
 	"require": {
-		"php": ">=5.3",
-		"phpbb/phpbb": "3.1.*@dev"
+		"php": ">=5.3"
 	},
 	"extra": {
-		"display-name": "phpBB 3.1 Extension Testing"
+		"display-name": "phpBB 3.1 Extension Testing",
+		"phpbb/phpbb": "3.1.*@dev"
 	}
 }