diff --git a/.drone.star b/.drone.star
index dca383a70de4..c816fbe96140 100644
--- a/.drone.star
+++ b/.drone.star
@@ -26,6 +26,7 @@ config = {
'allDatabases' : {
'phpVersions': [
'7.2',
+ '7.4',
]
},
'reducedDatabases' : {
@@ -40,7 +41,7 @@ config = {
},
'external-samba-windows' : {
'phpVersions': [
- '7.2',
+ '7.4',
],
'databases': [
'sqlite',
@@ -59,7 +60,7 @@ config = {
},
'external-other' : {
'phpVersions': [
- '7.2',
+ '7.4',
],
'databases': [
'sqlite',
@@ -590,7 +591,7 @@ def phpstan():
return pipelines
default = {
- 'phpVersions': ['7.2'],
+ 'phpVersions': ['7.4'],
'logLevel': '2',
}
@@ -667,7 +668,7 @@ def phan():
return pipelines
default = {
- 'phpVersions': ['7.2', '7.3'],
+ 'phpVersions': ['7.2', '7.3', '7.4'],
'logLevel': '2',
}
@@ -744,7 +745,7 @@ def litmus():
return pipelines
default = {
- 'phpVersions': ['7.2'],
+ 'phpVersions': ['7.4'],
'logLevel': '2'
}
@@ -909,7 +910,7 @@ def dav():
return pipelines
default = {
- 'phpVersions': ['7.2'],
+ 'phpVersions': ['7.4'],
'logLevel': '2'
}
@@ -1007,7 +1008,7 @@ def javascript():
default = {
'coverage': True,
'logLevel': '2',
- 'phpVersion': '7.2'
+ 'phpVersion': '7.4'
}
if 'defaults' in config:
@@ -1103,7 +1104,7 @@ def phptests(testType):
errorFound = False
default = {
- 'phpVersions': ['7.2', '7.3'],
+ 'phpVersions': ['7.2', '7.3', '7.4'],
'databases': [
'sqlite', 'mariadb:10.2', 'mariadb:10.3', 'mariadb:10.4', 'mysql:5.5', 'mysql:5.7', 'mysql:8.0', 'postgres:9.4', 'postgres:10.3', 'oracle'
],
@@ -1287,7 +1288,7 @@ def acceptance():
default = {
'federatedServerVersions': [''],
'browsers': ['chrome'],
- 'phpVersions': ['7.2'],
+ 'phpVersions': ['7.4'],
'databases': ['mariadb:10.2'],
'federatedServerNeeded': False,
'filterTags': '',
@@ -1308,6 +1309,7 @@ def acceptance():
'includeKeyInMatrixName': False,
'runAllSuites': False,
'numberOfParts': 1,
+ 'federatedPhpVersion': '7.2',
}
if 'defaults' in config:
@@ -1447,7 +1449,7 @@ def acceptance():
yarnInstall(phpVersion) +
installServer(phpVersion, db, params['logLevel'], params['federatedServerNeeded'], params['proxyNeeded']) +
(
- installFederated(federatedServerVersion, phpVersion, params['logLevel'], protocol, db, federationDbSuffix) +
+ installFederated(federatedServerVersion, params['federatedPhpVersion'], params['logLevel'], protocol, db, federationDbSuffix) +
owncloudLog('federated', 'federated') if params['federatedServerNeeded'] else []
) +
installExtraApps(phpVersion, extraAppsDict) +
@@ -1481,7 +1483,7 @@ def acceptance():
params['extraServices'] +
owncloudService(phpVersion, 'server', '/drone/src', params['useHttps']) +
((
- owncloudService(phpVersion, 'federated', '/drone/federated', params['useHttps']) +
+ owncloudService(params['federatedPhpVersion'], 'federated', '/drone/federated', params['useHttps']) +
databaseServiceForFederation(db, federationDbSuffix)
) if params['federatedServerNeeded'] else []),
'depends_on': [],
diff --git a/console.php b/console.php
index b22da3634b4a..4dc6b9e4e1e6 100644
--- a/console.php
+++ b/console.php
@@ -41,9 +41,9 @@
exit(1);
}
-// Show warning if PHP 7.4 or later is used as ownCloud is not compatible with PHP 7.4
-if (\version_compare(PHP_VERSION, '7.4.0alpha1') !== -1) {
- echo 'This version of ownCloud is not compatible with PHP 7.4' . PHP_EOL;
+// Show warning if PHP 7.5 or later is used as ownCloud is not compatible with PHP 7.5
+if (\version_compare(PHP_VERSION, '7.5.0alpha1') !== -1) {
+ echo 'This version of ownCloud is not compatible with PHP 7.5' . PHP_EOL;
echo 'You are currently running PHP ' . PHP_VERSION . '.' . PHP_EOL;
exit(1);
}
diff --git a/index.php b/index.php
index 164a2952b957..2f113b3eff8b 100644
--- a/index.php
+++ b/index.php
@@ -35,9 +35,9 @@
return;
}
-// Show warning if PHP 7.4 or later is used as ownCloud is not compatible with PHP 7.4
-if (\version_compare(PHP_VERSION, '7.4.0alpha1') !== -1) {
- echo 'This version of ownCloud is not compatible with PHP 7.4
';
+// Show warning if PHP 7.5 or later is used as ownCloud is not compatible with PHP 7.5
+if (\version_compare(PHP_VERSION, '7.5.0alpha1') !== -1) {
+ echo 'This version of ownCloud is not compatible with PHP 7.5
';
echo 'You are currently running PHP ' . PHP_VERSION . '.';
return;
}