makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12783] Move phpbb/phpbb require version to extra

Browse source 
PHPBB3-12783
This commit is contained in:
Joas Schilling 2014-06-28 13:06:46 +02:00
parent 404c2f1144
commit 2d116ffede
7 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/phpbb/extension/metadata_manager.php
View file

@ -306,7 +306,7 @@ class metadata_manager
*/ */
public function validate_require_phpbb() public function validate_require_phpbb()
{ {
if (!isset($this->metadata['require']['phpbb/phpbb'])) if (!isset($this->metadata['extra']['phpbb/phpbb']))
{ {
return false; return false;
} }
@ -369,7 +369,7 @@ class metadata_manager
'META_REQUIRE_PHP' => (isset($this->metadata['require']['php'])) ? htmlspecialchars($this->metadata['require']['php']) : '', 'META_REQUIRE_PHP' => (isset($this->metadata['require']['php'])) ? htmlspecialchars($this->metadata['require']['php']) : '',
'META_REQUIRE_PHP_FAIL' => !$this->validate_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']['phpbb/phpbb'])) ? htmlspecialchars($this->metadata['extra']['phpbb/phpbb']) : '',
'META_REQUIRE_PHPBB_FAIL' => !$this->validate_require_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'])) ? htmlspecialchars($this->metadata['extra']['display-name']) : '',

6
tests/extension/ext/barfoo/composer.json
View file

@ -13,10 +13,10 @@
"role": "N/A" "role": "N/A"
}], }],
"require": { "require": {
"php": ">=5.3", "php": ">=5.3"
"phpbb/phpbb": "3.1.*@dev"
}, },
"extra": { "extra": {
"display-name": "phpBB BarFoo Extension" "display-name": "phpBB BarFoo Extension",
"phpbb/phpbb": "3.1.*@dev"
} }
} }

6
tests/extension/ext/vendor/moo/composer.json vendored
View file

@ -13,10 +13,10 @@
"role": "N/A" "role": "N/A"
}], }],
"require": { "require": {
"php": ">=5.3", "php": ">=5.3"
"phpbb/phpbb": "3.1.*@dev"
}, },
"extra": { "extra": {
"display-name": "phpBB Moo Extension" "display-name": "phpBB Moo Extension",
"phpbb/phpbb": "3.1.*@dev"
} }
} }

6
tests/extension/ext/vendor2/bar/composer.json
View file

@ -12,10 +12,10 @@
"role": "N/A" "role": "N/A"
}], }],
"require": { "require": {
"php": ">=5.3", "php": ">=5.3"
"phpbb/phpbb": "3.1.*@dev"
}, },
"extra": { "extra": {
"display-name": "phpBB Bar Extension" "display-name": "phpBB Bar Extension",
"phpbb/phpbb": "3.1.*@dev"
} }
} }

6
tests/extension/ext/vendor2/foo/composer.json
View file

@ -12,10 +12,10 @@
"role": "N/A" "role": "N/A"
}], }],
"require": { "require": {
"php": ">=5.3", "php": ">=5.3"
"phpbb/phpbb": "3.1.*@dev"
}, },
"extra": { "extra": {
"display-name": "phpBB Foo Extension" "display-name": "phpBB Foo Extension",
"phpbb/phpbb": "3.1.*@dev"
} }
} }

14
tests/extension/metadata_manager_test.php
View file

@ -296,6 +296,8 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
$manager->merge_metadata(array( $manager->merge_metadata(array(
'require' => array( 'require' => array(
'php' => '10.0.0', 'php' => '10.0.0',
),
'extra' => array(
'phpbb/phpbb' => '3.2.0', // config is set to 3.1.0 '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( $manager->merge_metadata(array(
'require' => array( 'require' => array(
'php' => '5.3.0', 'php' => '5.3.0',
),
'extra' => array(
'phpbb/phpbb' => '3.1.0-beta', // config is set to 3.1.0 '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( $manager->merge_metadata(array(
'require' => array( 'require' => array(
'php' => '>' . phpversion(), 'php' => '>' . phpversion(),
),
'extra' => array(
'phpbb/phpbb' => '>3.1.0', // config is set to 3.1.0 '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( $manager->merge_metadata(array(
'require' => array( 'require' => array(
'php' => '<' . phpversion(), 'php' => '<' . phpversion(),
),
'extra' => array(
'phpbb/phpbb' => '<3.1.0', // config is set to 3.1.0 '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( $manager->merge_metadata(array(
'require' => array( 'require' => array(
'php' => phpversion(), 'php' => phpversion(),
),
'extra' => array(
'phpbb/phpbb' => '3.1.0', // config is set to 3.1.0 '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( $manager->merge_metadata(array(
'require' => array( 'require' => array(
'php' => '>=' . phpversion(), 'php' => '>=' . phpversion(),
),
'extra' => array(
'phpbb/phpbb' => '>=3.1.0', // config is set to 3.1.0 '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( $manager->merge_metadata(array(
'require' => array( 'require' => array(
'php' => '<=' . phpversion(), 'php' => '<=' . phpversion(),
),
'extra' => array(
'phpbb/phpbb' => '<=3.1.0', // config is set to 3.1.0 'phpbb/phpbb' => '<=3.1.0', // config is set to 3.1.0
), ),
)); ));

6
tests/functional/fixtures/ext/foo/bar/composer.json
View file

@ -13,10 +13,10 @@
"role": "Developer" "role": "Developer"
}], }],
"require": { "require": {
"php": ">=5.3", "php": ">=5.3"
"phpbb/phpbb": "3.1.*@dev"
}, },
"extra": { "extra": {
"display-name": "phpBB 3.1 Extension Testing" "display-name": "phpBB 3.1 Extension Testing",
"phpbb/phpbb": "3.1.*@dev"
} }
} }