From ed1d8d162c935c122ccbcac1ad45f945da46ea23 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Fri, 19 Jul 2024 08:34:18 +0200
Subject: [PATCH] feat(appinfo): Add api-version to info.xml

Signed-off-by: provokateurin <kate@provokateurin.de>
---
 lib/private/App/InfoParser.php           | 3 +++
 resources/app-info-shipped.xsd           | 2 ++
 resources/app-info.xsd                   | 2 ++
 tests/data/app/expected-info.json        | 1 +
 tests/data/app/navigation-one-item.json  | 3 ++-
 tests/data/app/navigation-two-items.json | 3 ++-
 tests/data/app/valid-info.xml            | 2 ++
 7 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/private/App/InfoParser.php b/lib/private/App/InfoParser.php
index 54afd0069fb..9df9828c184 100644
--- a/lib/private/App/InfoParser.php
+++ b/lib/private/App/InfoParser.php
@@ -119,6 +119,9 @@ class InfoParser {
 		if (!array_key_exists('backend', $array['dependencies'])) {
 			$array['dependencies']['backend'] = [];
 		}
+		if (!array_key_exists('api-version', $array)) {
+			$array['api-version'] = [];
+		}
 
 		if (array_key_exists('types', $array)) {
 			if (is_array($array['types'])) {
diff --git a/resources/app-info-shipped.xsd b/resources/app-info-shipped.xsd
index a340dde30bd..a7b27b8b834 100644
--- a/resources/app-info-shipped.xsd
+++ b/resources/app-info-shipped.xsd
@@ -18,6 +18,8 @@
                             maxOccurs="unbounded"/>
                 <xs:element name="version" type="semver"
                             minOccurs="1" maxOccurs="1"/>
+                <xs:element name="api-version" type="semver"
+                            minOccurs="0" maxOccurs="unbounded"/>
                 <xs:element name="licence" type="licence" minOccurs="1"
                             maxOccurs="unbounded"/>
                 <xs:element name="author" type="author" minOccurs="1"
diff --git a/resources/app-info.xsd b/resources/app-info.xsd
index 76cc02a8431..588df5c7882 100644
--- a/resources/app-info.xsd
+++ b/resources/app-info.xsd
@@ -18,6 +18,8 @@
                             maxOccurs="unbounded"/>
                 <xs:element name="version" type="semver"
                             minOccurs="1" maxOccurs="1"/>
+                <xs:element name="api-version" type="semver"
+                            minOccurs="0" maxOccurs="unbounded"/>
                 <xs:element name="licence" type="licence" minOccurs="1"
                             maxOccurs="unbounded"/>
                 <xs:element name="author" type="author" minOccurs="1"
diff --git a/tests/data/app/expected-info.json b/tests/data/app/expected-info.json
index c3ea27af7d3..9fd526680b3 100644
--- a/tests/data/app/expected-info.json
+++ b/tests/data/app/expected-info.json
@@ -79,6 +79,7 @@
 	},
 	"background-jobs": [],
 	"two-factor-providers": [],
+	"api-version": [1, 2],
 	"commands": [],
 	"activity": {
 		"filters": [],
diff --git a/tests/data/app/navigation-one-item.json b/tests/data/app/navigation-one-item.json
index 2bd81461586..e4076a52a5c 100644
--- a/tests/data/app/navigation-one-item.json
+++ b/tests/data/app/navigation-one-item.json
@@ -82,5 +82,6 @@
     "live-migration": [],
     "uninstall": []
   },
-  "two-factor-providers": []
+  "two-factor-providers": [],
+  "api-version": []
 }
diff --git a/tests/data/app/navigation-two-items.json b/tests/data/app/navigation-two-items.json
index 4b081d3bbd9..39894fa930c 100644
--- a/tests/data/app/navigation-two-items.json
+++ b/tests/data/app/navigation-two-items.json
@@ -88,5 +88,6 @@
     "live-migration": [],
     "uninstall": []
   },
-  "two-factor-providers": []
+  "two-factor-providers": [],
+  "api-version": []
 }
diff --git a/tests/data/app/valid-info.xml b/tests/data/app/valid-info.xml
index d2569788399..cd5c6e5e186 100644
--- a/tests/data/app/valid-info.xml
+++ b/tests/data/app/valid-info.xml
@@ -36,4 +36,6 @@
 		<owncloud min-version="7.0.1" max-version="8" />
 		<backend>caldav</backend>
 	</dependencies>
+	<api-version>1</api-version>
+	<api-version>2</api-version>
 </info>