Compare commits

..

1 Commits

Author SHA1 Message Date
dependabot[bot]
26c9cfe6bc Chore(deps-dev): Update phpunit/phpunit requirement
Updates the requirements on [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) to permit the latest version.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/12.3.0/ChangeLog-12.3.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.0.0...12.3.0)

---
updated-dependencies:
- dependency-name: phpunit/phpunit
  dependency-version: 12.3.0
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-08-02 02:30:27 +00:00
12 changed files with 13 additions and 25 deletions

8
composer.lock generated
View File

@@ -380,12 +380,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nextcloud-deps/ocp.git", "url": "https://github.com/nextcloud-deps/ocp.git",
"reference": "c2c75ad8fdc54cbc6341764b5a2a8ecf860e6160" "reference": "8ec87be7ab634f12a403fca7165319587a6cb218"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/c2c75ad8fdc54cbc6341764b5a2a8ecf860e6160", "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/8ec87be7ab634f12a403fca7165319587a6cb218",
"reference": "c2c75ad8fdc54cbc6341764b5a2a8ecf860e6160", "reference": "8ec87be7ab634f12a403fca7165319587a6cb218",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -421,7 +421,7 @@
"issues": "https://github.com/nextcloud-deps/ocp/issues", "issues": "https://github.com/nextcloud-deps/ocp/issues",
"source": "https://github.com/nextcloud-deps/ocp/tree/master" "source": "https://github.com/nextcloud-deps/ocp/tree/master"
}, },
"time": "2025-08-10T01:01:23+00:00" "time": "2025-07-26T00:55:00+00:00"
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",

View File

@@ -3,7 +3,6 @@ OC.L10N.register(
{ {
"Missing a temporary folder" : "Адсутнічае часовая папка", "Missing a temporary folder" : "Адсутнічае часовая папка",
"Could not write file to disk" : "Не ўдалося запісаць файл на дыск", "Could not write file to disk" : "Не ўдалося запісаць файл на дыск",
"A PHP extension stopped the file upload" : "Пашырэнне PHP спыніла запампоўванне файла",
"copy" : "копія", "copy" : "копія",
"Done" : "Гатова", "Done" : "Гатова",
"File" : "Файл", "File" : "Файл",
@@ -23,16 +22,13 @@ OC.L10N.register(
"Modified" : "Зменены", "Modified" : "Зменены",
"Save" : "Захаваць", "Save" : "Захаваць",
"Created:" : "Створана:", "Created:" : "Створана:",
"Reply" : "Адказаць",
"Open link" : "Адкрыць спасылку", "Open link" : "Адкрыць спасылку",
"seconds ago" : "с таму", "seconds ago" : "с таму",
"Keyboard shortcuts" : "Спалучэнні клавіш", "Keyboard shortcuts" : "Спалучэнні клавіш",
"Keyboard shortcut" : "Спалучэнне клавіш", "Keyboard shortcut" : "Спалучэнне клавіш",
"Action" : "Дзеянне",
"Search" : "Пошук", "Search" : "Пошук",
"Shared with you" : "Абагулена з вамі", "Shared with you" : "Абагулена з вамі",
"An error occurred" : "Узнікла памылка", "An error occurred" : "Узнікла памылка",
"No notifications" : "Няма апавяшчэнняў",
"Today" : "Сёння", "Today" : "Сёння",
"Close" : "Закрыць", "Close" : "Закрыць",
"Share" : "Абагуліць" "Share" : "Абагуліць"

View File

@@ -1,7 +1,6 @@
{ "translations": { { "translations": {
"Missing a temporary folder" : "Адсутнічае часовая папка", "Missing a temporary folder" : "Адсутнічае часовая папка",
"Could not write file to disk" : "Не ўдалося запісаць файл на дыск", "Could not write file to disk" : "Не ўдалося запісаць файл на дыск",
"A PHP extension stopped the file upload" : "Пашырэнне PHP спыніла запампоўванне файла",
"copy" : "копія", "copy" : "копія",
"Done" : "Гатова", "Done" : "Гатова",
"File" : "Файл", "File" : "Файл",
@@ -21,16 +20,13 @@
"Modified" : "Зменены", "Modified" : "Зменены",
"Save" : "Захаваць", "Save" : "Захаваць",
"Created:" : "Створана:", "Created:" : "Створана:",
"Reply" : "Адказаць",
"Open link" : "Адкрыць спасылку", "Open link" : "Адкрыць спасылку",
"seconds ago" : "с таму", "seconds ago" : "с таму",
"Keyboard shortcuts" : "Спалучэнні клавіш", "Keyboard shortcuts" : "Спалучэнні клавіш",
"Keyboard shortcut" : "Спалучэнне клавіш", "Keyboard shortcut" : "Спалучэнне клавіш",
"Action" : "Дзеянне",
"Search" : "Пошук", "Search" : "Пошук",
"Shared with you" : "Абагулена з вамі", "Shared with you" : "Абагулена з вамі",
"An error occurred" : "Узнікла памылка", "An error occurred" : "Узнікла памылка",
"No notifications" : "Няма апавяшчэнняў",
"Today" : "Сёння", "Today" : "Сёння",
"Close" : "Закрыць", "Close" : "Закрыць",
"Share" : "Абагуліць" "Share" : "Абагуліць"

View File

@@ -274,7 +274,6 @@ OC.L10N.register(
"{count} comments, {unread} unread" : "コメント {count} 件あり、 {unread} 件未読", "{count} comments, {unread} unread" : "コメント {count} 件あり、 {unread} 件未読",
"Todo items" : "Todo項目", "Todo items" : "Todo項目",
"Edit card title" : "カードタイトルを編集する", "Edit card title" : "カードタイトルを編集する",
"Open link" : "リンクを開く",
"Card deleted" : "カードが削除されました", "Card deleted" : "カードが削除されました",
"Edit title" : "タイトルを編集", "Edit title" : "タイトルを編集",
"Assign to me" : "自分に割り当てる", "Assign to me" : "自分に割り当てる",

View File

@@ -272,7 +272,6 @@
"{count} comments, {unread} unread" : "コメント {count} 件あり、 {unread} 件未読", "{count} comments, {unread} unread" : "コメント {count} 件あり、 {unread} 件未読",
"Todo items" : "Todo項目", "Todo items" : "Todo項目",
"Edit card title" : "カードタイトルを編集する", "Edit card title" : "カードタイトルを編集する",
"Open link" : "リンクを開く",
"Card deleted" : "カードが削除されました", "Card deleted" : "カードが削除されました",
"Edit title" : "タイトルを編集", "Edit title" : "タイトルを編集",
"Assign to me" : "自分に割り当てる", "Assign to me" : "自分に割り当てる",

View File

@@ -274,7 +274,6 @@ OC.L10N.register(
"{count} comments, {unread} unread" : "{count} комментариев, {unread} непрочитано", "{count} comments, {unread} unread" : "{count} комментариев, {unread} непрочитано",
"Todo items" : "Элементы списка задач", "Todo items" : "Элементы списка задач",
"Edit card title" : "Изменить заголовок карточки", "Edit card title" : "Изменить заголовок карточки",
"Open link" : "Открыть ссылку",
"Card deleted" : "Карточка удалена", "Card deleted" : "Карточка удалена",
"Edit title" : "Редактировать заголовок", "Edit title" : "Редактировать заголовок",
"Assign to me" : "Назначить себе", "Assign to me" : "Назначить себе",

View File

@@ -272,7 +272,6 @@
"{count} comments, {unread} unread" : "{count} комментариев, {unread} непрочитано", "{count} comments, {unread} unread" : "{count} комментариев, {unread} непрочитано",
"Todo items" : "Элементы списка задач", "Todo items" : "Элементы списка задач",
"Edit card title" : "Изменить заголовок карточки", "Edit card title" : "Изменить заголовок карточки",
"Open link" : "Открыть ссылку",
"Card deleted" : "Карточка удалена", "Card deleted" : "Карточка удалена",
"Edit title" : "Редактировать заголовок", "Edit title" : "Редактировать заголовок",
"Assign to me" : "Назначить себе", "Assign to me" : "Назначить себе",

View File

@@ -45,7 +45,8 @@ class SessionMapper extends QBMapper {
$qb->select('id', 'board_id', 'last_contact', 'user_id', 'token') $qb->select('id', 'board_id', 'last_contact', 'user_id', 'token')
->from($this->getTableName()) ->from($this->getTableName())
->where($qb->expr()->eq('board_id', $qb->createNamedParameter($boardId))) ->where($qb->expr()->eq('board_id', $qb->createNamedParameter($boardId)))
->andWhere($qb->expr()->gt('last_contact', $qb->createNamedParameter(time() - SessionService::SESSION_VALID_TIME))); ->andWhere($qb->expr()->gt('last_contact', $qb->createNamedParameter(time() - SessionService::SESSION_VALID_TIME)))
->executeQuery();
return $this->findEntities($qb); return $this->findEntities($qb);
} }

View File

@@ -621,9 +621,7 @@ class BoardService {
if ($fullDetails) { if ($fullDetails) {
$this->enrichWithStacks($board); $this->enrichWithStacks($board);
if ($board->getLabels() === null) { $this->enrichWithLabels($board);
$this->enrichWithLabels($board);
}
$this->enrichWithUsers($board); $this->enrichWithUsers($board);
$this->enrichWithBoardSettings($board); $this->enrichWithBoardSettings($board);
$this->enrichWithActiveSessions($board); $this->enrichWithActiveSessions($board);

View File

@@ -214,7 +214,7 @@ class PermissionService {
} }
try { try {
$board = $this->getBoard($boardId); $board = $this->boardMapper->find($boardId);
} catch (DoesNotExistException $e) { } catch (DoesNotExistException $e) {
return []; return [];
} catch (MultipleObjectsReturnedException $e) { } catch (MultipleObjectsReturnedException $e) {
@@ -227,7 +227,7 @@ class PermissionService {
} else { } else {
$users[$board->getOwner()] = new User($board->getOwner(), $this->userManager); $users[$board->getOwner()] = new User($board->getOwner(), $this->userManager);
} }
$acls = $board->getAcl(); $acls = $this->aclMapper->findAll($boardId);
/** @var Acl $acl */ /** @var Acl $acl */
foreach ($acls as $acl) { foreach ($acls as $acl) {
if ($acl->getType() === Acl::PERMISSION_TYPE_USER) { if ($acl->getType() === Acl::PERMISSION_TYPE_USER) {

View File

@@ -1,6 +1,6 @@
{ {
"require-dev": { "require-dev": {
"phpunit/phpunit": "~9", "phpunit/phpunit": "~12",
"behat/behat": "~3.23.0", "behat/behat": "~3.23.0",
"guzzlehttp/guzzle": "7.9.2", "guzzlehttp/guzzle": "7.9.2",
"jarnaiz/behat-junit-formatter": "^1.3", "jarnaiz/behat-junit-formatter": "^1.3",

View File

@@ -347,8 +347,9 @@ class PermissionServiceTest extends \Test\TestCase {
->method('__call') ->method('__call')
->with('getOwner', []) ->with('getOwner', [])
->willReturn('user1'); ->willReturn('user1');
$board->expects($this->any()) $this->aclMapper->expects($this->once())
->method('getAcl') ->method('findAll')
->with(123)
->willReturn([$aclUser, $aclGroup]); ->willReturn([$aclUser, $aclGroup]);
$this->boardMapper->expects($this->once()) $this->boardMapper->expects($this->once())
->method('find') ->method('find')