Drop support for nextcloud version 22
Signed-off-by: Swikriti Tripathi <swikriti808@gmail.com>
This commit is contained in:
Родитель
0786f6a990
Коммит
a19b805860
|
@ -11,11 +11,9 @@ jobs:
|
||||||
name: unit tests and linting
|
name: unit tests and linting
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
nextcloudVersion: [ stable22, stable23, stable24, stable25, stable26, master ]
|
nextcloudVersion: [ stable23, stable24, stable25, stable26, master ]
|
||||||
phpVersion: [ 7.4, 8.0, 8.1 ]
|
phpVersion: [ 7.4, 8.0, 8.1 ]
|
||||||
exclude:
|
exclude:
|
||||||
- nextcloudVersion: stable22
|
|
||||||
phpVersion: 8.1
|
|
||||||
- nextcloudVersion: stable23
|
- nextcloudVersion: stable23
|
||||||
phpVersion: 8.1
|
phpVersion: 8.1
|
||||||
- nextcloudVersion: stable24
|
- nextcloudVersion: stable24
|
||||||
|
@ -158,14 +156,11 @@ jobs:
|
||||||
name: API tests
|
name: API tests
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
nextcloudVersion: [ stable22, stable23, stable24, stable25, stable26, master ]
|
nextcloudVersion: [ stable23, stable24, stable25, stable26, master ]
|
||||||
phpVersionMajor: [ 7, 8 ]
|
phpVersionMajor: [ 7, 8 ]
|
||||||
phpVersionMinor: [ 4, 1 ]
|
phpVersionMinor: [ 4, 1 ]
|
||||||
database: [pgsql, mysql]
|
database: [pgsql, mysql]
|
||||||
exclude:
|
exclude:
|
||||||
- nextcloudVersion: stable22
|
|
||||||
phpVersionMajor: 8
|
|
||||||
phpVersionMinor: 1
|
|
||||||
- nextcloudVersion: stable23
|
- nextcloudVersion: stable23
|
||||||
phpVersionMajor: 8
|
phpVersionMajor: 8
|
||||||
phpVersionMinor: 1
|
phpVersionMinor: 1
|
||||||
|
|
|
@ -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/screenshot1.png</screenshot>
|
||||||
<screenshot>https://github.com/nextcloud/integration_openproject/raw/master/img/screenshot2.png</screenshot>
|
<screenshot>https://github.com/nextcloud/integration_openproject/raw/master/img/screenshot2.png</screenshot>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<nextcloud min-version="22" max-version="27"/>
|
<nextcloud min-version="23" max-version="27"/>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<background-jobs>
|
<background-jobs>
|
||||||
<job>OCA\OpenProject\BackgroundJob\RemoveExpiredDirectUploadTokens</job>
|
<job>OCA\OpenProject\BackgroundJob\RemoveExpiredDirectUploadTokens</job>
|
||||||
|
|
|
@ -16,7 +16,6 @@ use DateTimeZone;
|
||||||
use Exception;
|
use Exception;
|
||||||
use InvalidArgumentException;
|
use InvalidArgumentException;
|
||||||
use OC\User\NoUserException;
|
use OC\User\NoUserException;
|
||||||
use OC_Util;
|
|
||||||
use OCA\OpenProject\Exception\OpenprojectGroupfolderSetupConflictException;
|
use OCA\OpenProject\Exception\OpenprojectGroupfolderSetupConflictException;
|
||||||
use OCA\GroupFolders\Folder\FolderManager;
|
use OCA\GroupFolders\Folder\FolderManager;
|
||||||
use OCP\App\IAppManager;
|
use OCP\App\IAppManager;
|
||||||
|
@ -988,10 +987,6 @@ class OpenProjectAPIService {
|
||||||
// @phpstan-ignore-next-line - make phpstan not complain if groupfolders app does not exist
|
// @phpstan-ignore-next-line - make phpstan not complain if groupfolders app does not exist
|
||||||
$folderId = $groupFolderManager->getFolderByPath($openProjectFolder);
|
$folderId = $groupFolderManager->getFolderByPath($openProjectFolder);
|
||||||
$userId = $this->userManager->get(Application::OPEN_PROJECT_ENTITIES_NAME);
|
$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
|
// @phpstan-ignore-next-line - make phpstan not complain if groupfolders app does not exist
|
||||||
return $groupFolderManager->canManageACL($folderId, $userId);
|
return $groupFolderManager->canManageACL($folderId, $userId);
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче