From 2d116ffede84fd8483de8bf093a695dae3ceb4dd Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 28 Jun 2014 13:06:46 +0200 Subject: [ticket/12783] Move phpbb/phpbb require version to extra PHPBB3-12783 --- tests/extension/ext/barfoo/composer.json | 6 +++--- tests/extension/ext/vendor/moo/composer.json | 6 +++--- tests/extension/ext/vendor2/bar/composer.json | 6 +++--- tests/extension/ext/vendor2/foo/composer.json | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'tests/extension/ext') 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" } } -- cgit v1.2.1 From 3f0dec4ce69abeb1a3c4ca043dc1ff8783f1c06d Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 2 Jul 2014 16:23:20 +0200 Subject: [ticket/12783] Move phpbb requirement to extra->soft-require PHPBB3-12783 --- tests/extension/ext/barfoo/composer.json | 4 +++- tests/extension/ext/vendor/moo/composer.json | 4 +++- tests/extension/ext/vendor2/bar/composer.json | 4 +++- tests/extension/ext/vendor2/foo/composer.json | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) (limited to 'tests/extension/ext') 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" + } } } -- cgit v1.2.1