From f65eba52ebbb99746054a31128b1e6c7661378e6 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 30 Nov 2023 11:53:47 +0100 Subject: [PATCH] fix(copyright): Fix copyright doc blocks Signed-off-by: Joas Schilling --- .../lib/CalDAV/FreeBusy/FreeBusyGenerator.php | 40 ++++++++--------- apps/dav/lib/CalDAV/Status/Status.php | 43 ++++++++++--------- apps/dav/lib/CalDAV/Status/StatusService.php | 23 ---------- .../lib/ContactsMenu/StatusProvider.php | 2 +- apps/user_status/lib/Db/UserStatusMapper.php | 2 +- .../user_status/lib/Service/StatusService.php | 2 +- .../Service/StatusServiceIntegrationTest.php | 2 +- 7 files changed, 46 insertions(+), 68 deletions(-) diff --git a/apps/dav/lib/CalDAV/FreeBusy/FreeBusyGenerator.php b/apps/dav/lib/CalDAV/FreeBusy/FreeBusyGenerator.php index 84dd05dfa5559..2148e6a1da255 100644 --- a/apps/dav/lib/CalDAV/FreeBusy/FreeBusyGenerator.php +++ b/apps/dav/lib/CalDAV/FreeBusy/FreeBusyGenerator.php @@ -1,26 +1,26 @@ - * * - * * @author Anna Larch - * * - * * This library is free software; you can redistribute it and/or - * * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * * License as published by the Free Software Foundation; either - * * version 3 of the License, or any later version. - * * - * * This library is distributed in the hope that it will be useful, - * * but WITHOUT ANY WARRANTY; without even the implied warranty of - * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * * GNU AFFERO GENERAL PUBLIC LICENSE for more details. - * * - * * You should have received a copy of the GNU Affero General Public - * * License along with this library. If not, see . - * * + +/** + * @copyright 2023 Anna Larch + * + * @author Anna Larch + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . * */ diff --git a/apps/dav/lib/CalDAV/Status/Status.php b/apps/dav/lib/CalDAV/Status/Status.php index da08d3fe2856b..46ddf7e47f302 100644 --- a/apps/dav/lib/CalDAV/Status/Status.php +++ b/apps/dav/lib/CalDAV/Status/Status.php @@ -1,25 +1,26 @@ - * * - * * @author Anna Larch - * * - * * This library is free software; you can redistribute it and/or - * * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * * License as published by the Free Software Foundation; either - * * version 3 of the License, or any later version. - * * - * * This library is distributed in the hope that it will be useful, - * * but WITHOUT ANY WARRANTY; without even the implied warranty of - * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * * GNU AFFERO GENERAL PUBLIC LICENSE for more details. - * * - * * You should have received a copy of the GNU Affero General Public - * * License along with this library. If not, see . - * * + +declare(strict_types=1); + +/** + * @copyright 2023 Anna Larch + * + * @author Anna Larch + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . * */ diff --git a/apps/dav/lib/CalDAV/Status/StatusService.php b/apps/dav/lib/CalDAV/Status/StatusService.php index eea4c12db238b..add8a668f7a41 100644 --- a/apps/dav/lib/CalDAV/Status/StatusService.php +++ b/apps/dav/lib/CalDAV/Status/StatusService.php @@ -1,27 +1,4 @@ - * * - * * @author Anna Larch - * * - * * This library is free software; you can redistribute it and/or - * * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * * License as published by the Free Software Foundation; either - * * version 3 of the License, or any later version. - * * - * * This library is distributed in the hope that it will be useful, - * * but WITHOUT ANY WARRANTY; without even the implied warranty of - * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * * GNU AFFERO GENERAL PUBLIC LICENSE for more details. - * * - * * You should have received a copy of the GNU Affero General Public - * * License along with this library. If not, see . - * * - * - */ declare(strict_types=1); diff --git a/apps/user_status/lib/ContactsMenu/StatusProvider.php b/apps/user_status/lib/ContactsMenu/StatusProvider.php index 7eb0d7a41e156..e9dc08ffa2cf3 100644 --- a/apps/user_status/lib/ContactsMenu/StatusProvider.php +++ b/apps/user_status/lib/ContactsMenu/StatusProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -/* +/** * @copyright 2023 Christoph Wurst * * @author 2023 Christoph Wurst diff --git a/apps/user_status/lib/Db/UserStatusMapper.php b/apps/user_status/lib/Db/UserStatusMapper.php index 3621c1bfa9666..06f69fe0ac875 100644 --- a/apps/user_status/lib/Db/UserStatusMapper.php +++ b/apps/user_status/lib/Db/UserStatusMapper.php @@ -102,7 +102,7 @@ public function findAllRecent(?int $limit = null, ?int $offset = null): array { * @return UserStatus * @throws \OCP\AppFramework\Db\DoesNotExistException */ - public function findByUserId(string $userId, bool $isBackup = false):UserStatus { + public function findByUserId(string $userId, bool $isBackup = false): UserStatus { $qb = $this->db->getQueryBuilder(); $qb ->select('*') diff --git a/apps/user_status/lib/Service/StatusService.php b/apps/user_status/lib/Service/StatusService.php index 114764f193df9..9582c403329cc 100644 --- a/apps/user_status/lib/Service/StatusService.php +++ b/apps/user_status/lib/Service/StatusService.php @@ -137,7 +137,7 @@ public function findAllRecentStatusChanges(?int $limit = null, ?int $offset = nu * @return UserStatus * @throws DoesNotExistException */ - public function findByUserId(string $userId):UserStatus { + public function findByUserId(string $userId): UserStatus { return $this->processStatus($this->mapper->findByUserId($userId)); } diff --git a/apps/user_status/tests/Integration/Service/StatusServiceIntegrationTest.php b/apps/user_status/tests/Integration/Service/StatusServiceIntegrationTest.php index 798e591f97543..182cac562179d 100644 --- a/apps/user_status/tests/Integration/Service/StatusServiceIntegrationTest.php +++ b/apps/user_status/tests/Integration/Service/StatusServiceIntegrationTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -/* +/** * @copyright 2023 Christoph Wurst * * @author 2023 Christoph Wurst