Merge pull request #607 from owncloud/php-dependencies-for-composer-2.0

Adjust PHP dependencies for composer 2.0
owncloud · Nov 3, 2020 · 73773d5 · 73773d5
2 parents 9456d38 + cc47a1b
commit 73773d5
Show file tree

Hide file tree

Showing 3 changed files with 429 additions and 244 deletions.
diff --git a/.drone.star b/.drone.star
@@ -201,6 +201,7 @@ def phpstan():
 	default = {
 		'phpVersions': ['7.2'],
 		'logLevel': '2',
+		'extraApps': {},
 	}
 
 	if 'defaults' in config:
@@ -240,6 +241,7 @@ def phpstan():
 				'steps':
 					installCore('daily-master-qa', 'sqlite', False) +
 					installApp(phpVersion) +
+					installExtraApps(phpVersion, params['extraApps']) +
 					setupServerAndApp(phpVersion, params['logLevel']) +
 				[
 					{
@@ -845,7 +847,7 @@ def acceptance():
 									},
 									'steps':
 										installCore(server, db, params['useBundledApp']) +
-										installTestrunner(phpVersion, params['useBundledApp']) +
+										installTestrunner('7.4', params['useBundledApp']) +
 										(installFederated(server, phpVersion, params['logLevel'], db, federationDbSuffix) + owncloudLog('federated') if params['federatedServerNeeded'] else []) +
 										installApp(phpVersion) +
 										installExtraApps(phpVersion, params['extraApps']) +
@@ -858,7 +860,7 @@ def acceptance():
 									[
 										({
 											'name': 'acceptance-tests',
-											'image': 'owncloudci/php:%s' % phpVersion,
+											'image': 'owncloudci/php:7.4',
 											'pull': 'always',
 											'environment': environment,
 											'commands': params['extraCommandsBeforeTestRun'] + [

diff --git a/composer.json b/composer.json
@@ -2,11 +2,11 @@
   "name": "owncloud/market",
   "config" : {
     "platform": {
-        "php": "7.0.8"
+        "php": "7.2"
     }
   },
   "require": {
-      "php": ">=7.0.8"
+      "php": ">=7.2"
   },
   "require-dev": {
     "bamarni/composer-bin-plugin": "^1.4",