diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-07-03 14:24:47 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-07-03 14:24:47 +0200 |
| commit | 05bd866cb3e0938c034bff45014c4cb3c760dcd9 (patch) | |
| tree | d86021aca6c5619c22a9df66b01144bd8cdc12d6 /tests/functional | |
| parent | df38b2829a60a0353a2c9f46646f71d11446ff9f (diff) | |
| parent | 0232fcc22ac8e5e7ba916db9049a903f53788421 (diff) | |
| download | forums-05bd866cb3e0938c034bff45014c4cb3c760dcd9.tar forums-05bd866cb3e0938c034bff45014c4cb3c760dcd9.tar.gz forums-05bd866cb3e0938c034bff45014c4cb3c760dcd9.tar.bz2 forums-05bd866cb3e0938c034bff45014c4cb3c760dcd9.tar.xz forums-05bd866cb3e0938c034bff45014c4cb3c760dcd9.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12783] Move phpbb requirement to extra->soft-require
[ticket/12783] Correctly use dataProviders and mark tests as incomplete
[ticket/12783] Move phpbb/phpbb require version to extra
Diffstat (limited to 'tests/functional')
| -rw-r--r-- | tests/functional/fixtures/ext/foo/bar/composer.json | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/functional/fixtures/ext/foo/bar/composer.json b/tests/functional/fixtures/ext/foo/bar/composer.json index 2f91426d2a..f0c7f0e6c1 100644 --- a/tests/functional/fixtures/ext/foo/bar/composer.json +++ b/tests/functional/fixtures/ext/foo/bar/composer.json @@ -13,10 +13,12 @@ "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", + "soft-require": { + "phpbb/phpbb": "3.1.*@dev" + } } } |