From a19b80586096a70598adc542f856dffc0e20fada Mon Sep 17 00:00:00 2001
From: Swikriti Tripathi <swikriti808@gmail.com>
Date: Tue, 28 Mar 2023 13:25:16 +0545
Subject: [PATCH] Drop support for nextcloud version 22

Signed-off-by: Swikriti Tripathi <swikriti808@gmail.com>
---
 .github/workflows/ci.yml              | 9 ++-------
 appinfo/info.xml                      | 2 +-
 lib/Service/OpenProjectAPIService.php | 5 -----
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 55e9e200..390d087c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,11 +11,9 @@ jobs:
     name: unit tests and linting
     strategy:
       matrix:
-        nextcloudVersion: [ stable22, stable23, stable24, stable25, stable26, master ]
+        nextcloudVersion: [ stable23, stable24, stable25, stable26, master ]
         phpVersion: [ 7.4, 8.0, 8.1 ]
         exclude:
-          - nextcloudVersion: stable22
-            phpVersion: 8.1
           - nextcloudVersion: stable23
             phpVersion: 8.1
           - nextcloudVersion: stable24
@@ -158,14 +156,11 @@ jobs:
     name: API tests
     strategy:
       matrix:
-        nextcloudVersion: [ stable22, stable23, stable24, stable25, stable26, master ]
+        nextcloudVersion: [ stable23, stable24, stable25, stable26, master ]
         phpVersionMajor: [ 7, 8 ]
         phpVersionMinor: [ 4, 1 ]
         database: [pgsql, mysql]
         exclude:
-          - nextcloudVersion: stable22
-            phpVersionMajor: 8
-            phpVersionMinor: 1
           - nextcloudVersion: stable23
             phpVersionMajor: 8
             phpVersionMinor: 1
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 2530a3d7..3e1a853e 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -35,7 +35,7 @@ For more information on how to set up and use the OpenProject application, pleas
 	<screenshot>https://github.com/nextcloud/integration_openproject/raw/master/img/screenshot1.png</screenshot>
 	<screenshot>https://github.com/nextcloud/integration_openproject/raw/master/img/screenshot2.png</screenshot>
 	<dependencies>
-		<nextcloud min-version="22" max-version="27"/>
+		<nextcloud min-version="23" max-version="27"/>
 	</dependencies>
 	<background-jobs>
 		<job>OCA\OpenProject\BackgroundJob\RemoveExpiredDirectUploadTokens</job>
diff --git a/lib/Service/OpenProjectAPIService.php b/lib/Service/OpenProjectAPIService.php
index b4cad030..bab52005 100644
--- a/lib/Service/OpenProjectAPIService.php
+++ b/lib/Service/OpenProjectAPIService.php
@@ -16,7 +16,6 @@ use DateTimeZone;
 use Exception;
 use InvalidArgumentException;
 use OC\User\NoUserException;
-use OC_Util;
 use OCA\OpenProject\Exception\OpenprojectGroupfolderSetupConflictException;
 use OCA\GroupFolders\Folder\FolderManager;
 use OCP\App\IAppManager;
@@ -988,10 +987,6 @@ class OpenProjectAPIService {
 		// @phpstan-ignore-next-line - make phpstan not complain if groupfolders app does not exist
 		$folderId = $groupFolderManager->getFolderByPath($openProjectFolder);
 		$userId = $this->userManager->get(Application::OPEN_PROJECT_ENTITIES_NAME);
-		if (version_compare(OC_Util::getVersionString(), '22.2.10', '<=')) {
-			// for version 22 and lower, `canManageACL` function takes string not IUser
-			$userId = Application::OPEN_PROJECT_ENTITIES_NAME;
-		}
 		// @phpstan-ignore-next-line - make phpstan not complain if groupfolders app does not exist
 		return $groupFolderManager->canManageACL($folderId, $userId);
 	}