mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-11 11:13:59 +02:00
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
This commit is contained in:
@@ -13,10 +13,12 @@
|
||||
"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",
|
||||
"soft-require": {
|
||||
"phpbb/phpbb": "3.1.*@dev"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
8
tests/extension/ext/vendor/moo/composer.json
vendored
8
tests/extension/ext/vendor/moo/composer.json
vendored
@@ -13,10 +13,12 @@
|
||||
"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",
|
||||
"soft-require": {
|
||||
"phpbb/phpbb": "3.1.*@dev"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -12,10 +12,12 @@
|
||||
"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",
|
||||
"soft-require": {
|
||||
"phpbb/phpbb": "3.1.*@dev"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -12,10 +12,12 @@
|
||||
"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",
|
||||
"soft-require": {
|
||||
"phpbb/phpbb": "3.1.*@dev"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user