diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-07-02 16:23:20 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-07-02 16:23:20 +0200 |
| commit | 3f0dec4ce69abeb1a3c4ca043dc1ff8783f1c06d (patch) | |
| tree | f119d0645735491b8b6a4b4d91eb9b8498a7a555 | |
| parent | 07cb08fd18c51f09555cab6a3edb92daa617a4d0 (diff) | |
| download | forums-3f0dec4ce69abeb1a3c4ca043dc1ff8783f1c06d.tar forums-3f0dec4ce69abeb1a3c4ca043dc1ff8783f1c06d.tar.gz forums-3f0dec4ce69abeb1a3c4ca043dc1ff8783f1c06d.tar.bz2 forums-3f0dec4ce69abeb1a3c4ca043dc1ff8783f1c06d.tar.xz forums-3f0dec4ce69abeb1a3c4ca043dc1ff8783f1c06d.zip | |
[ticket/12783] Move phpbb requirement to extra->soft-require
PHPBB3-12783
| -rw-r--r-- | phpBB/phpbb/extension/metadata_manager.php | 4 | ||||
| -rw-r--r-- | tests/extension/ext/barfoo/composer.json | 4 | ||||
| -rw-r--r-- | tests/extension/ext/vendor/moo/composer.json | 4 | ||||
| -rw-r--r-- | tests/extension/ext/vendor2/bar/composer.json | 4 | ||||
| -rw-r--r-- | tests/extension/ext/vendor2/foo/composer.json | 4 | ||||
| -rw-r--r-- | tests/extension/metadata_manager_test.php | 4 | ||||
| -rw-r--r-- | tests/functional/fixtures/ext/foo/bar/composer.json | 4 |
7 files changed, 20 insertions, 8 deletions
diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php index 1112d23457..1051021ea7 100644 --- a/phpBB/phpbb/extension/metadata_manager.php +++ b/phpBB/phpbb/extension/metadata_manager.php @@ -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']) : '', diff --git a/tests/extension/ext/barfoo/composer.json b/tests/extension/ext/barfoo/composer.json index bbd76ae143..05bb099707 100644 --- a/tests/extension/ext/barfoo/composer.json +++ b/tests/extension/ext/barfoo/composer.json @@ -17,6 +17,8 @@ }, "extra": { "display-name": "phpBB BarFoo Extension", - "phpbb/phpbb": "3.1.*@dev" + "soft-require": { + "phpbb/phpbb": "3.1.*@dev" + } } } diff --git a/tests/extension/ext/vendor/moo/composer.json b/tests/extension/ext/vendor/moo/composer.json index 4ad91627d5..d49aab47cd 100644 --- a/tests/extension/ext/vendor/moo/composer.json +++ b/tests/extension/ext/vendor/moo/composer.json @@ -17,6 +17,8 @@ }, "extra": { "display-name": "phpBB Moo Extension", - "phpbb/phpbb": "3.1.*@dev" + "soft-require": { + "phpbb/phpbb": "3.1.*@dev" + } } } diff --git a/tests/extension/ext/vendor2/bar/composer.json b/tests/extension/ext/vendor2/bar/composer.json index 39c0560c36..9d2ed86a0c 100644 --- a/tests/extension/ext/vendor2/bar/composer.json +++ b/tests/extension/ext/vendor2/bar/composer.json @@ -16,6 +16,8 @@ }, "extra": { "display-name": "phpBB Bar Extension", - "phpbb/phpbb": "3.1.*@dev" + "soft-require": { + "phpbb/phpbb": "3.1.*@dev" + } } } diff --git a/tests/extension/ext/vendor2/foo/composer.json b/tests/extension/ext/vendor2/foo/composer.json index 9ce7068afd..efcdfc338f 100644 --- a/tests/extension/ext/vendor2/foo/composer.json +++ b/tests/extension/ext/vendor2/foo/composer.json @@ -16,6 +16,8 @@ }, "extra": { "display-name": "phpBB Foo Extension", - "phpbb/phpbb": "3.1.*@dev" + "soft-require": { + "phpbb/phpbb": "3.1.*@dev" + } } } diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php index 5d691b1503..6b6ea80d82 100644 --- a/tests/extension/metadata_manager_test.php +++ b/tests/extension/metadata_manager_test.php @@ -309,7 +309,9 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case 'php' => $php_version, ), 'extra' => array( - 'phpbb/phpbb' => $phpbb_version, // config is set to 3.1.0 + 'soft-require' => array( + 'phpbb/phpbb' => $phpbb_version, // 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 3e8e98e9bd..f0c7f0e6c1 100644 --- a/tests/functional/fixtures/ext/foo/bar/composer.json +++ b/tests/functional/fixtures/ext/foo/bar/composer.json @@ -17,6 +17,8 @@ }, "extra": { "display-name": "phpBB 3.1 Extension Testing", - "phpbb/phpbb": "3.1.*@dev" + "soft-require": { + "phpbb/phpbb": "3.1.*@dev" + } } } |