feat: php 8.3

.drone.star

@@ -4,7 +4,8 @@ MINIO_MC = "minio/mc:RELEASE.2020-12-18T10-53-53Z"
 OC_CI_ALPINE = "owncloudci/alpine:latest"
 OC_CI_BAZEL_BUILDIFIER = "owncloudci/bazel-buildifier"
 OC_CI_CEPH = "owncloudci/ceph:tag-build-master-jewel-ubuntu-16.04"
-OC_CI_CORE = "owncloudci/core"
+OC_CI_CORE = "owncloudci/core:php83"
+OC_CI_CORE_OLD = "owncloudci/core:nodejs14"
 OC_CI_DRONE_SKIP_PIPELINE = "owncloudci/drone-skip-pipeline"
 OC_CI_NODEJS = "owncloudci/nodejs:%s"
 OC_CI_ORACLE_XE = "owncloudci/oracle-xe:latest"
@@ -21,7 +22,8 @@ SELENIUM_STANDALONE_CHROME_DEBUG = "selenium/standalone-chrome-debug:3.141.59-ox
 SELENIUM_STANDALONE_FIREFOX_DEBUG = "selenium/standalone-firefox-debug:3.8.1"
 SONARSOURCE_SONAR_SCANNER_CLI = "sonarsource/sonar-scanner-cli"
 
-DEFAULT_PHP_VERSION = "7.4"
+DEFAULT_PHP_VERSION = "8.3"
+PREVIOUS_PHP_VERSION = "7.4"
 DEFAULT_NODEJS_VERSION = "14"
 
 # minio mc environment variables
@@ -266,7 +268,7 @@ config = {
                 },
                 {
                     "name": "configure-app-on-federated-server",
-                    "image": OC_CI_PHP % DEFAULT_PHP_VERSION,
+                    "image": OC_CI_PHP % PREVIOUS_PHP_VERSION,
                     "commands": [
                         "cd %s" % dir["federated"],
                         "php occ market:install user_ldap",
@@ -317,7 +319,7 @@ config = {
                 },
                 {
                     "name": "configure-app-on-federated-server",
-                    "image": OC_CI_PHP % DEFAULT_PHP_VERSION,
+                    "image": OC_CI_PHP % PREVIOUS_PHP_VERSION,
                     "commands": [
                         "cd %s" % dir["federated"],
                         "php occ market:install user_ldap",
@@ -414,7 +416,7 @@ config = {
                 },
                 {
                     "name": "configure-app-on-federated-server",
-                    "image": OC_CI_PHP % DEFAULT_PHP_VERSION,
+                    "image": OC_CI_PHP % PREVIOUS_PHP_VERSION,
                     "commands": [
                         "cd %s" % dir["federated"],
                         "php occ market:install user_ldap",
@@ -466,7 +468,7 @@ config = {
                 },
                 {
                     "name": "configure-app-on-federated-server",
-                    "image": OC_CI_PHP % DEFAULT_PHP_VERSION,
+                    "image": OC_CI_PHP % PREVIOUS_PHP_VERSION,
                     "commands": [
                         "cd %s" % dir["federated"],
                         "php occ market:install user_ldap",
@@ -518,7 +520,7 @@ config = {
                 },
                 {
                     "name": "configure-app-on-federated-server",
-                    "image": OC_CI_PHP % DEFAULT_PHP_VERSION,
+                    "image": OC_CI_PHP % PREVIOUS_PHP_VERSION,
                     "commands": [
                         "cd %s" % dir["federated"],
                         "php occ market:install user_ldap",
@@ -628,7 +630,7 @@ config = {
                 },
                 {
                     "name": "configure-app-on-federated-server",
-                    "image": OC_CI_PHP % DEFAULT_PHP_VERSION,
+                    "image": OC_CI_PHP % PREVIOUS_PHP_VERSION,
                     "commands": [
                         "cd %s" % dir["federated"],
                         "php occ market:install user_ldap",
@@ -1681,6 +1683,11 @@ def acceptance(ctx):
                         environment["S3_TYPE"] = "scality"
 
                 federationDbSuffix = "-federated"
+                federatedPhpVersion = PREVIOUS_PHP_VERSION
+                if (testConfig["federatedServerVersion"] == "latest"):
+                    federatedPhpVersion = PREVIOUS_PHP_VERSION
+                if (testConfig["federatedServerVersion"] == "git"):
+                    federatedPhpVersion = DEFAULT_PHP_VERSION
 
                 if len(testConfig["federatedServerVersion"]) == 0:
                     testConfig["federatedServerVersion"] = testConfig["server"]
@@ -1694,9 +1701,10 @@ def acceptance(ctx):
                         "path": "testrunner/apps/%s" % ctx.repo.name,
                     },
                     "steps": skipIfUnchanged(ctx, "acceptance-tests") +
+                             waitForServer(testConfig["federatedServerNeeded"]) +
                              installCore(ctx, testConfig["server"], testConfig["database"], testConfig["useBundledApp"]) +
                              installTestrunner(ctx, DEFAULT_PHP_VERSION, testConfig["useBundledApp"]) +
-                             (installFederated(testConfig["federatedServerVersion"], phpVersionForDocker, testConfig["logLevel"], testConfig["database"], federationDbSuffix) + owncloudLog("federated") if testConfig["federatedServerNeeded"] else []) +
+                             (installFederated(testConfig["federatedServerVersion"], federatedPhpVersion, testConfig["logLevel"], testConfig["database"], federationDbSuffix) + owncloudLog("federated") if testConfig["federatedServerNeeded"] else []) +
                              installAppPhp(ctx, phpVersionForDocker) +
                              installAppJavaScript(ctx) +
                              installExtraApps(phpVersionForDocker, testConfig["extraApps"]) +
@@ -1706,7 +1714,6 @@ def acceptance(ctx):
                              setupScality(testConfig["scalityS3"]) +
                              setupElasticSearch(testConfig["esVersion"]) +
                              testConfig["extraSetup"] +
-                             waitForServer(testConfig["federatedServerNeeded"]) +
                              waitForEmailService(testConfig["emailNeeded"]) +
                              waitForSamba(testConfig["extraServices"]) +
                              fixPermissions(phpVersionForDocker, testConfig["federatedServerNeeded"], params["selUserNeeded"]) +
@@ -1737,7 +1744,7 @@ def acceptance(ctx):
                                 testConfig["extraServices"] +
                                 owncloudService(testConfig["server"], phpVersionForDocker, "server", dir["server"], testConfig["ssl"], testConfig["xForwardedFor"]) +
                                 ((
-                                    owncloudService(testConfig["federatedServerVersion"], phpVersionForDocker, "federated", dir["federated"], testConfig["ssl"], testConfig["xForwardedFor"]) +
+                                    owncloudService(testConfig["federatedServerVersion"], federatedPhpVersion, "federated", dir["federated"], testConfig["ssl"], testConfig["xForwardedFor"]) +
                                     databaseServiceForFederation(testConfig["database"], federationDbSuffix)
                                 ) if testConfig["federatedServerNeeded"] else []),
                     "depends_on": [],
@@ -2184,7 +2191,7 @@ def installCore(ctx, version, db, useBundledApp):
         "name": "install-core",
         "image": OC_CI_CORE,
         "settings": {
-            "version": version,
+            "git_reference": "master",
             "core_path": dir["server"],
             "db_type": dbType,
             "db_name": database,
@@ -2440,6 +2447,12 @@ def installFederated(federatedServerVersion, phpVersion, logLevel, db, dbSuffix
     password = getDbPassword(db)
     database = getDbDatabase(db) + dbSuffix
 
+    image = OC_CI_CORE
+    if (federatedServerVersion == "10.9.1"):
+        image = OC_CI_CORE_OLD
+    if (federatedServerVersion == "latest"):
+        image = OC_CI_CORE_OLD
+
     if host == "mariadb":
         dbType = "mysql"
     elif host == "postgres":
@@ -2449,7 +2462,7 @@ def installFederated(federatedServerVersion, phpVersion, logLevel, db, dbSuffix
     return [
         {
             "name": "install-federated",
-            "image": OC_CI_CORE,
+            "image": image,
             "settings": {
                 "version": federatedServerVersion,
                 "core_path": dir["federated"],
@@ -2758,7 +2771,7 @@ def ldapIntegration(ctx):
 
     default = {
         "servers": ["daily-master-qa"],
-        "phpVersions": ["7.4"],
+        "phpVersions": [DEFAULT_PHP_VERSION],
         "databases": ["mysql:8.0"],
         "ldapNeeded": True,
         "logLevel": "2",
@@ -2805,6 +2818,7 @@ def ldapIntegration(ctx):
                             "steps": installCore(ctx, server, db, False) +
                                      installAppPhp(ctx, phpVersion) +
                                      setupServerAndApp(ctx, phpVersion, params["logLevel"]) +
+                                     owncloudLog("server") +
                                      [
                                          ({
                                              "name": "ldap-integration-tests",

.github/workflows/main.yml

@@ -19,7 +19,7 @@ concurrency:
 
 env:
   APP_NAME: user_ldap
-  PHP_VERSIONS: '["7.4"]'
+  PHP_VERSIONS: '["8.3"]'
 
 jobs:
   get-vars:

appinfo/info.xml

@@ -25,8 +25,8 @@ More information is available in the [LDAP User and Group Backend documentation]
 	<screenshot>https://raw.githubusercontent.com/owncloud/screenshots/master/user_ldap/ownCloud-app-ldap-user-management.jpg</screenshot>
 	<dependencies>
 		<lib>ldap</lib>
-		<owncloud min-version="10.15" max-version="11" />
-                <php min-version="7.4" />
+		<owncloud min-version="11" max-version="11" />
+		<php min-version="8.3" />
 	</dependencies>
 
 	<namespace>User_LDAP</namespace>

composer.json

@@ -1,18 +1,19 @@
 {
     "config": {
         "platform": {
-            "php": "7.3"
+            "php": "8.3"
         },
         "allow-plugins": {
             "bamarni/composer-bin-plugin": true
         }
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.8",
-        "laminas/laminas-ldap": "^2.13"
+        "laminas/laminas-ldap": "^2.13",
+        "roave/security-advisories": "dev-latest"
     },
     "require": {
-        "php": ">=7.3",
+        "php": ">=8.3",
         "ext-ldap": "*"
     },
     "extra": {