diff --git a/.drone.star b/.drone.star
index 209b9ef0..ed2b8e19 100644
--- a/.drone.star
+++ b/.drone.star
@@ -21,12 +21,11 @@ config = {
     "phpunit": {
         "allDatabases": {
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
         },
         "reducedDatabases": {
             "phpVersions": [
-                "7.3",
                 "7.4",
             ],
             "databases": [
@@ -67,7 +66,6 @@ config = {
                 "daily-master-qa",
             ],
             "phpVersions": [
-                "7.2",
                 "7.3",
                 "7.4",
             ],
@@ -85,7 +83,7 @@ config = {
                 "daily-master-qa",
             ],
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
         },
         "api-with-core-latest": {
@@ -102,7 +100,7 @@ config = {
                 "latest",
             ],
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
         },
         "api-with-ldaps": {
@@ -118,12 +116,12 @@ config = {
                 "latest",
             ],
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
             "extraSetup": [
                 {
                     "name": "configure-app",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "wait-for-it -t 600 ldap:636",
@@ -150,7 +148,6 @@ config = {
                 "daily-master-qa",
             ],
             "phpVersions": [
-                "7.2",
                 "7.3",
                 "7.4",
             ],
@@ -167,7 +164,7 @@ config = {
                 "daily-master-qa",
             ],
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
         },
         "cli-with-core-latest": {
@@ -183,7 +180,7 @@ config = {
                 "latest",
             ],
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
         },
         "cli-with-ldaps": {
@@ -198,12 +195,12 @@ config = {
                 "latest",
             ],
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
             "extraSetup": [
                 {
                     "name": "configure-app",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "wait-for-it -t 600 ldap:636",
@@ -231,7 +228,6 @@ config = {
                 "daily-master-qa",
             ],
             "phpVersions": [
-                "7.2",
                 "7.3",
                 "7.4",
             ],
@@ -249,7 +245,7 @@ config = {
                 "daily-master-qa",
             ],
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
         },
         "webUI-with-core-latest": {
@@ -266,7 +262,7 @@ config = {
                 "latest",
             ],
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
         },
         "webUI-with-ldaps": {
@@ -282,12 +278,12 @@ config = {
                 "latest",
             ],
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
             "extraSetup": [
                 {
                     "name": "configure-app",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "wait-for-it -t 600 ldap:636",
@@ -314,7 +310,7 @@ config = {
                 "daily-master-qa",
             ],
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
             "runCoreTests": True,
             "federatedServerNeeded": True,
@@ -324,7 +320,7 @@ config = {
             "extraSetup": [
                 {
                     "name": "configure-app",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "wait-for-it -t 600 ldap:636",
@@ -338,7 +334,7 @@ config = {
                 },
                 {
                     "name": "configure-app-on-federated-server",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "cd /var/www/owncloud/federated",
@@ -363,7 +359,7 @@ config = {
                 "latest",
             ],
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
             "runCoreTests": True,
             "federatedServerNeeded": True,
@@ -374,7 +370,7 @@ config = {
             "extraSetup": [
                 {
                     "name": "configure-app",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "wait-for-it -t 600 ldap:636",
@@ -388,7 +384,7 @@ config = {
                 },
                 {
                     "name": "configure-app-on-federated-server",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "cd /var/www/owncloud/federated",
@@ -413,7 +409,7 @@ config = {
                 "daily-master-qa",
             ],
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
             "runCoreTests": True,
             "runAllSuites": True,
@@ -432,7 +428,7 @@ config = {
                 "latest",
             ],
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
             "runCoreTests": True,
             "runAllSuites": True,
@@ -452,7 +448,7 @@ config = {
                 "daily-master-qa",
             ],
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
             "emailNeeded": True,
             "runCoreTests": True,
@@ -463,7 +459,7 @@ config = {
             "extraSetup": [
                 {
                     "name": "configure-app",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "wait-for-it -t 600 ldap:636",
@@ -477,7 +473,7 @@ config = {
                 },
                 {
                     "name": "configure-app-on-federated-server",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "cd /var/www/owncloud/federated",
@@ -502,7 +498,7 @@ config = {
                 "latest",
             ],
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
             "emailNeeded": True,
             "runCoreTests": True,
@@ -514,7 +510,7 @@ config = {
             "extraSetup": [
                 {
                     "name": "configure-app",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "wait-for-it -t 600 ldap:636",
@@ -528,7 +524,7 @@ config = {
                 },
                 {
                     "name": "configure-app-on-federated-server",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "cd /var/www/owncloud/federated",
@@ -553,7 +549,7 @@ config = {
                 "latest",
             ],
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
             "runCoreTests": True,
             "federatedServerNeeded": True,
@@ -567,7 +563,7 @@ config = {
             "extraSetup": [
                 {
                     "name": "configure-app",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "wait-for-it -t 600 ldap:636",
@@ -581,7 +577,7 @@ config = {
                 },
                 {
                     "name": "configure-app-on-federated-server",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "cd /var/www/owncloud/federated",
@@ -595,7 +591,7 @@ config = {
                 },
                 {
                     "name": "configure-encryption",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "cd /var/www/owncloud/server",
@@ -617,7 +613,7 @@ config = {
                 "latest",
             ],
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
             "runCoreTests": True,
             "cron": "nightly",
@@ -631,7 +627,7 @@ config = {
             "extraSetup": [
                 {
                     "name": "configure-app",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "wait-for-it -t 600 ldap:636",
@@ -645,7 +641,7 @@ config = {
                 },
                 {
                     "name": "configure-encryption",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "cd /var/www/owncloud/server",
@@ -667,7 +663,7 @@ config = {
                 "latest",
             ],
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
             "emailNeeded": True,
             "runCoreTests": True,
@@ -682,7 +678,7 @@ config = {
             "extraSetup": [
                 {
                     "name": "configure-app",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "wait-for-it -t 600 ldap:636",
@@ -696,7 +692,7 @@ config = {
                 },
                 {
                     "name": "configure-app-on-federated-server",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "cd /var/www/owncloud/federated",
@@ -710,7 +706,7 @@ config = {
                 },
                 {
                     "name": "configure-encryption",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "cd /var/www/owncloud/server",
@@ -732,7 +728,7 @@ config = {
                 "latest",
             ],
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
             "runCoreTests": True,
             "federatedServerNeeded": True,
@@ -746,7 +742,7 @@ config = {
             "extraSetup": [
                 {
                     "name": "configure-app",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "wait-for-it -t 600 ldap:636",
@@ -760,7 +756,7 @@ config = {
                 },
                 {
                     "name": "configure-app-on-federated-server",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "cd /var/www/owncloud/federated",
@@ -774,7 +770,7 @@ config = {
                 },
                 {
                     "name": "configure-encryption",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "cd /var/www/owncloud/server",
@@ -796,7 +792,7 @@ config = {
                 "latest",
             ],
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
             "runCoreTests": True,
             "cron": "nightly",
@@ -810,7 +806,7 @@ config = {
             "extraSetup": [
                 {
                     "name": "configure-app",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "wait-for-it -t 600 ldap:636",
@@ -824,7 +820,7 @@ config = {
                 },
                 {
                     "name": "configure-encryption",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "cd /var/www/owncloud/server",
@@ -846,7 +842,7 @@ config = {
                 "latest",
             ],
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
             "emailNeeded": True,
             "runCoreTests": True,
@@ -861,7 +857,7 @@ config = {
             "extraSetup": [
                 {
                     "name": "configure-app",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "wait-for-it -t 600 ldap:636",
@@ -875,7 +871,7 @@ config = {
                 },
                 {
                     "name": "configure-app-on-federated-server",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "cd /var/www/owncloud/federated",
@@ -889,7 +885,7 @@ config = {
                 },
                 {
                     "name": "configure-encryption",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "cd /var/www/owncloud/server",
@@ -907,7 +903,7 @@ config = {
             "extraSetup": [
                 {
                     "name": "configure-app",
-                    "image": "owncloudci/php:7.2",
+                    "image": "owncloudci/php:7.3",
                     "pull": "always",
                     "commands": [
                         "wait-for-it -t 600 ldap:636",
@@ -960,7 +956,7 @@ def main(ctx):
     return before + coverageTests + afterCoverageTests + nonCoverageTests + stages + after
 
 def beforePipelines(ctx):
-    return codestyle(ctx) + jscodestyle(ctx) + checkForRecentBuilds(ctx) + phpstan(ctx) + phan(ctx) + checkStarlark()
+    return codestyle(ctx) + jscodestyle(ctx) + checkForRecentBuilds(ctx) + phpstan(ctx) + phan(ctx) + phplint(ctx) + checkStarlark()
 
 def coveragePipelines(ctx):
     # All unit test pipelines that have coverage or other test analysis reported
@@ -1008,7 +1004,7 @@ def codestyle(ctx):
         return pipelines
 
     default = {
-        "phpVersions": ["7.2"],
+        "phpVersions": ["7.3"],
     }
 
     if "defaults" in config:
@@ -1173,9 +1169,10 @@ def phpstan(ctx):
         return pipelines
 
     default = {
-        "phpVersions": ["7.2"],
+        "phpVersions": ["7.3"],
         "logLevel": "2",
         "extraApps": {},
+        "enableApp": True,
     }
 
     if "defaults" in config:
@@ -1215,7 +1212,7 @@ def phpstan(ctx):
                 "steps": installCore(ctx, "daily-master-qa", "sqlite", False) +
                          installApp(ctx, phpVersion) +
                          installExtraApps(phpVersion, params["extraApps"]) +
-                         setupServerAndApp(ctx, phpVersion, params["logLevel"]) +
+                         setupServerAndApp(ctx, phpVersion, params["logLevel"], False, params["enableApp"]) +
                          [
                              {
                                  "name": "phpstan",
@@ -1249,7 +1246,7 @@ def phan(ctx):
         return pipelines
 
     default = {
-        "phpVersions": ["7.2", "7.3", "7.4"],
+        "phpVersions": ["7.3", "7.4"],
     }
 
     if "defaults" in config:
@@ -1320,7 +1317,7 @@ def build(ctx):
         return pipelines
 
     default = {
-        "phpVersions": ["7.2"],
+        "phpVersions": ["7.3"],
         "commands": [
             "make dist",
         ],
@@ -1417,6 +1414,7 @@ def javascript(ctx, withCoverage):
         "extraCommandsBeforeTestRun": [],
         "extraTeardown": [],
         "skip": False,
+        "enableApp": True,
     }
 
     if "defaults" in config:
@@ -1458,12 +1456,12 @@ def javascript(ctx, withCoverage):
         },
         "steps": installCore(ctx, "daily-master-qa", "sqlite", False) +
                  installApp(ctx, "7.4") +
-                 setupServerAndApp(ctx, "7.4", params["logLevel"]) +
+                 setupServerAndApp(ctx, "7.4", params["logLevel"], False, params["enableApp"]) +
                  params["extraSetup"] +
                  [
                      {
                          "name": "js-tests",
-                         "image": "owncloudci/php:8.0",
+                         "image": "owncloudci/nodejs:%s" % getNodeJsVersion(),
                          "pull": "always",
                          "environment": params["extraEnvironment"],
                          "commands": params["extraCommandsBeforeTestRun"] + [
@@ -1518,7 +1516,7 @@ def phpTests(ctx, testType, withCoverage):
     errorFound = False
 
     default = {
-        "phpVersions": ["7.2", "7.3", "7.4"],
+        "phpVersions": ["7.3", "7.4"],
         "databases": [
             "sqlite",
             "mariadb:10.2",
@@ -1538,6 +1536,7 @@ def phpTests(ctx, testType, withCoverage):
         "extraApps": {},
         "extraTeardown": [],
         "skip": False,
+        "enableApp": True,
     }
 
     if "defaults" in config:
@@ -1630,7 +1629,7 @@ def phpTests(ctx, testType, withCoverage):
                     "steps": installCore(ctx, "daily-master-qa", db, False) +
                              installApp(ctx, phpVersion) +
                              installExtraApps(phpVersion, params["extraApps"]) +
-                             setupServerAndApp(ctx, phpVersion, params["logLevel"]) +
+                             setupServerAndApp(ctx, phpVersion, params["logLevel"], False, params["enableApp"]) +
                              setupCeph(params["cephS3"]) +
                              setupScality(params["scalityS3"]) +
                              params["extraSetup"] +
@@ -1714,7 +1713,7 @@ def acceptance(ctx):
     default = {
         "servers": ["daily-master-qa", "latest"],
         "browsers": ["chrome"],
-        "phpVersions": ["7.2"],
+        "phpVersions": ["7.4"],
         "databases": ["mariadb:10.2"],
         "esVersions": ["none"],
         "federatedServerNeeded": False,
@@ -1744,6 +1743,7 @@ def acceptance(ctx):
         "debugSuites": [],
         "skipExceptParts": [],
         "earlyFail": True,
+        "enableApp": True,
     }
 
     if "defaults" in config:
@@ -1794,7 +1794,7 @@ def acceptance(ctx):
                 params["extraSetup"] = [
                     {
                         "name": "configure-app",
-                        "image": "owncloudci/php:7.2",
+                        "image": "owncloudci/php:7.4",
                         "pull": "always",
                         "commands": [
                             "cd /var/www/owncloud/server/apps/files_primary_s3",
@@ -1960,7 +1960,7 @@ def acceptance(ctx):
                              (installFederated(testConfig["server"], testConfig["phpVersion"], testConfig["logLevel"], testConfig["database"], federationDbSuffix) + owncloudLog("federated") if testConfig["federatedServerNeeded"] else []) +
                              installApp(ctx, testConfig["phpVersion"]) +
                              installExtraApps(testConfig["phpVersion"], testConfig["extraApps"]) +
-                             setupServerAndApp(ctx, testConfig["phpVersion"], testConfig["logLevel"], testConfig["federatedServerNeeded"]) +
+                             setupServerAndApp(ctx, testConfig["phpVersion"], testConfig["logLevel"], testConfig["federatedServerNeeded"], params["enableApp"]) +
                              owncloudLog("server") +
                              setupCeph(testConfig["cephS3"]) +
                              setupScality(testConfig["scalityS3"]) +
@@ -2257,10 +2257,11 @@ def elasticSearchService(esVersion):
 
     return [{
         "name": "elasticsearch",
-        "image": "webhippie/elasticsearch:%s" % esVersion,
+        "image": "owncloudops/elasticsearch:%s" % esVersion,
         "pull": "always",
         "environment": {
-            "ELASTICSEARCH_PLUGINS_INSTALL": "ingest-attachment",
+            "ELASTICSEARCH_ROOT_LOG_LEVEL": "warn",
+            "ELASTICSEARCH_BOOTSTRAP_MEMORY_LOCK": "false",
         },
     }]
 
@@ -2373,6 +2374,13 @@ def getDbDatabase(db):
 
     return "owncloud"
 
+def getNodeJsVersion():
+    if "nodeJsVersion" not in config:
+        # We use nodejs 14 as the default
+        return "14"
+    else:
+        return config["nodeJsVersion"]
+
 def cacheRestore():
     return [{
         "name": "cache-restore",
@@ -2489,7 +2497,23 @@ def installApp(ctx, phpVersion):
     if "appInstallCommand" not in config:
         return []
 
-    return [{
+    if "buildJsDeps" not in config:
+        installJsDeps = False
+    else:
+        installJsDeps = config["buildJsDeps"]
+
+    return [
+        {
+            "name": "install-app-js-%s" % config["app"],
+            "image": "owncloudci/nodejs:%s" % getNodeJsVersion(),
+            "pull": "always",
+            "commands": [
+                "cd /var/www/owncloud/server/apps/%s" % config["app"],
+                "make install-js-deps",
+                "make build-dev",
+            ],
+        },
+    ] if installJsDeps else [] + [{
         "name": "install-app-%s" % ctx.repo.name,
         "image": "owncloudci/php:%s" % phpVersion,
         "pull": "always",
@@ -2499,7 +2523,7 @@ def installApp(ctx, phpVersion):
         ],
     }]
 
-def setupServerAndApp(ctx, phpVersion, logLevel, federatedServerNeeded = False):
+def setupServerAndApp(ctx, phpVersion, logLevel, federatedServerNeeded = False, enableApp = True):
     return [{
         "name": "setup-server-%s" % ctx.repo.name,
         "image": "owncloudci/php:%s" % phpVersion,
@@ -2507,7 +2531,7 @@ def setupServerAndApp(ctx, phpVersion, logLevel, federatedServerNeeded = False):
         "commands": [
             "cd %s" % dir["server"],
             "php occ a:l",
-            "php occ a:e %s" % ctx.repo.name,
+            "php occ a:e %s" % ctx.repo.name if enableApp else "",
             "php occ a:e testing",
             "php occ a:l",
             "php occ config:system:set trusted_domains 1 --value=server",
@@ -2534,7 +2558,7 @@ def setupCeph(serviceParams):
 
     return [{
         "name": "setup-ceph",
-        "image": "owncloudci/php:7.2",
+        "image": "owncloudci/php:7.4",
         "pull": "always",
         "commands": setupCommands + ([
             "./apps/files_primary_s3/tests/drone/create-bucket.sh",
@@ -2562,7 +2586,7 @@ def setupScality(serviceParams):
 
     return [{
         "name": "setup-scality",
-        "image": "owncloudci/php:7.2",
+        "image": "owncloudci/php:7.4",
         "pull": "always",
         "commands": setupCommands + ([
             "php occ s3:create-bucket owncloud --accept-warning",
@@ -2577,7 +2601,7 @@ def setupElasticSearch(esVersion):
 
     return [{
         "name": "setup-es",
-        "image": "owncloudci/php:7.2",
+        "image": "owncloudci/php:7.4",
         "pull": "always",
         "commands": [
             "cd %s" % dir["server"],
@@ -2817,6 +2841,63 @@ def checkStarlark():
         },
     }]
 
+def phplint(ctx):
+    pipelines = []
+
+    if "phplint" not in config:
+        return pipelines
+
+    if type(config["phplint"]) == "bool":
+        if not config["phplint"]:
+            return pipelines
+
+    result = {
+        "kind": "pipeline",
+        "type": "docker",
+        "name": "lint-test",
+        "workspace": {
+            "base": "/var/www/owncloud",
+            "path": "server/apps/%s" % ctx.repo.name,
+        },
+        "steps": installNPM() +
+                 lintTest(),
+        "depends_on": [],
+        "trigger": {
+            "ref": [
+                "refs/heads/master",
+                "refs/tags/**",
+                "refs/pull/**",
+            ],
+        },
+    }
+
+    for branch in config["branches"]:
+        result["trigger"]["ref"].append("refs/heads/%s" % branch)
+
+    pipelines.append(result)
+
+    return pipelines
+
+def installNPM():
+    return [{
+        "name": "npm-install",
+        "image": "owncloudci/nodejs:%s" % getNodeJsVersion(),
+        "pull": "always",
+        "commands": [
+            "yarn install --frozen-lockfile",
+        ],
+    }]
+
+def lintTest():
+    return [{
+        "name": "lint-test",
+        "image": "owncloudci/php:7.4",
+        "pull": "always",
+        "commands": [
+            "make test-lint",
+        ],
+    }]
+
 # This is custom starlark code added just for user_ldap
 # It is not committed to the starlark "standard" code in other apps because
 # it is just an unusual way that integration tests have been structured here
diff --git a/composer.json b/composer.json
index 4b729a41..0c72f85f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "platform": {
-            "php": "7.1"
+            "php": "7.3"
         }
     },
     "require-dev": {
@@ -9,7 +9,7 @@
         "laminas/laminas-ldap": "^2.8"
     },
     "require": {
-        "php": ">=7.1",
+        "php": ">=7.3",
         "ext-ldap": "*"
     },
     "extra": {
diff --git a/composer.lock b/composer.lock
index 1ea1ec2b..af322402 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "81bb36fbe03d19d1ae5bbd01808fbb2b",
+    "content-hash": "86e6d7658941e0e1ead74abf24062ef8",
     "packages": [],
     "packages-dev": [
         {
@@ -59,44 +59,38 @@
         },
         {
             "name": "laminas/laminas-ldap",
-            "version": "2.10.3",
+            "version": "2.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-ldap.git",
-                "reference": "649fae8982149b93071c4a7d56f2c4efeed51aa8"
+                "reference": "c1370452cd6548e103fb181d8e6e1fca9954dba4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-ldap/zipball/649fae8982149b93071c4a7d56f2c4efeed51aa8",
-                "reference": "649fae8982149b93071c4a7d56f2c4efeed51aa8",
+                "url": "https://api.github.com/repos/laminas/laminas-ldap/zipball/c1370452cd6548e103fb181d8e6e1fca9954dba4",
+                "reference": "c1370452cd6548e103fb181d8e6e1fca9954dba4",
                 "shasum": ""
             },
             "require": {
                 "ext-ldap": "*",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
+                "laminas/laminas-zendframework-bridge": "^1.1",
+                "php": "^7.3 || ~8.0.0"
             },
             "replace": {
                 "zendframework/zend-ldap": "^2.10.1"
             },
             "require-dev": {
                 "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-config": "^2.5",
-                "laminas/laminas-eventmanager": "^2.6.3 || ^3.0.1",
-                "laminas/laminas-stdlib": "^2.7 || ^3.0",
-                "php-mock/php-mock-phpunit": "^1.1.2 || ^2.1.1",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20"
+                "laminas/laminas-config": "^3.4",
+                "laminas/laminas-eventmanager": "^3.3",
+                "laminas/laminas-stdlib": "^3.3",
+                "php-mock/php-mock-phpunit": "^2.6",
+                "phpunit/phpunit": "^9.5.0"
             },
             "suggest": {
                 "laminas/laminas-eventmanager": "Laminas\\EventManager component"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.10.x-dev",
-                    "dev-develop": "2.11.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Laminas\\Ldap\\": "src/"
@@ -120,28 +114,36 @@
                 "rss": "https://github.com/laminas/laminas-ldap/releases.atom",
                 "source": "https://github.com/laminas/laminas-ldap"
             },
-            "time": "2020-03-29T13:06:47+00:00"
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
+            "time": "2021-01-12T17:18:02+00:00"
         },
         {
             "name": "laminas/laminas-zendframework-bridge",
-            "version": "1.1.1",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
-                "reference": "6ede70583e101030bcace4dcddd648f760ddf642"
+                "reference": "13af2502d9bb6f7d33be2de4b51fb68c6cdb476e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/6ede70583e101030bcace4dcddd648f760ddf642",
-                "reference": "6ede70583e101030bcace4dcddd648f760ddf642",
+                "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/13af2502d9bb6f7d33be2de4b51fb68c6cdb476e",
+                "reference": "13af2502d9bb6f7d33be2de4b51fb68c6cdb476e",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0 || ^8.0"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3",
-                "squizlabs/php_codesniffer": "^3.5"
+                "psalm/plugin-phpunit": "^0.15.1",
+                "squizlabs/php_codesniffer": "^3.5",
+                "vimeo/psalm": "^4.6"
             },
             "type": "library",
             "extra": {
@@ -180,7 +182,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2020-09-14T14:23:00+00:00"
+            "time": "2021-06-24T12:49:22+00:00"
         }
     ],
     "aliases": [],
@@ -189,12 +191,12 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.1",
+        "php": ">=7.3",
         "ext-ldap": "*"
     },
     "platform-dev": [],
     "platform-overrides": {
-        "php": "7.1"
+        "php": "7.3"
     },
-    "plugin-api-version": "2.0.0"
+    "plugin-api-version": "2.1.0"
 }