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

[ticket/12783] Move phpbb requirement to extra->soft-require

Browse source 
PHPBB3-12783
This commit is contained in:
Joas Schilling 2014-07-02 16:23:20 +02:00
parent 07cb08fd18
commit 3f0dec4ce6
7 changed files with 20 additions and 8 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()
{
if (!isset($this->metadata['extra']['phpbb/phpbb']))
if (!isset($this->metadata['extra']['soft-require']['phpbb/phpbb']))
{
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_FAIL' => !$this->validate_require_php(),
'META_REQUIRE_PHPBB' => (isset($this->metadata['extra']['phpbb/phpbb'])) ? htmlspecialchars($this->metadata['extra']['phpbb/phpbb']) : '',
'META_REQUIRE_PHPBB' => (isset($this->metadata['extra']['soft-require']['phpbb/phpbb'])) ? htmlspecialchars($this->metadata['extra']['soft-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']) : '',

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

@ -17,6 +17,8 @@
},
"extra": {
"display-name": "phpBB BarFoo Extension",
"soft-require": {
"phpbb/phpbb": "3.1.*@dev"
}
}
}

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

@ -17,6 +17,8 @@
},
"extra": {
"display-name": "phpBB Moo Extension",
"soft-require": {
"phpbb/phpbb": "3.1.*@dev"
}
}
}

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

@ -16,6 +16,8 @@
},
"extra": {
"display-name": "phpBB Bar Extension",
"soft-require": {
"phpbb/phpbb": "3.1.*@dev"
}
}
}

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

@ -16,6 +16,8 @@
},
"extra": {
"display-name": "phpBB Foo Extension",
"soft-require": {
"phpbb/phpbb": "3.1.*@dev"
}
}
}

2
tests/extension/metadata_manager_test.php
View file

@ -309,8 +309,10 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
'php' => $php_version,
),
'extra' => array(
'soft-require' => array(
'phpbb/phpbb' => $phpbb_version, // config is set to 3.1.0
),
),
));
$this->assertEquals($expected_php, $manager->validate_require_php());

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

@ -17,6 +17,8 @@
},
"extra": {
"display-name": "phpBB 3.1 Extension Testing",
"soft-require": {
"phpbb/phpbb": "3.1.*@dev"
}
}
}