Skip to content

Commit f7f56de

Browse files
authored
Merge pull request #1355 from ConductionNL/development
Merge development to beta
2 parents 9d0c82b + 0065301 commit f7f56de

107 files changed

Lines changed: 39966 additions & 15 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Retrofit annotation commits (opsx-annotate, 2026-04-23)
2+
197da46fc795acb5052f1557f675dbf14d8d24f0
3+
5e0d5a800318df890f69328e6ea25f685316a167

.github/workflows/quality.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ name: Code Quality
22

33
on:
44
push:
5-
branches: [main, development, feature/**, bugfix/**, hotfix/**]
5+
branches: [main, beta, development, feature/**, bugfix/**, hotfix/**]
66
pull_request:
7+
types: [opened, reopened]
78
branches: [main, beta, development]
89
workflow_dispatch:
910

@@ -13,6 +14,7 @@ concurrency:
1314

1415
jobs:
1516
quality:
17+
if: github.event_name != 'push' || github.event.created != true
1618
uses: ConductionNL/.github/.github/workflows/quality.yml@main
1719
with:
1820
app-name: openregister

composer.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/BackgroundJob/DestructionCheckJob.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
* @version GIT: <git_id>
1717
*
1818
* @link https://www.OpenRegister.app
19+
*
20+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-2
21+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-63
1922
*/
2023

2124
declare(strict_types=1);
@@ -161,6 +164,8 @@ protected function run($argument): void
161164
* @return void
162165
*
163166
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
167+
*
168+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-63
164169
*/
165170
private function sendPreDestructionNotifications(
166171
RetentionService $retentionService,
@@ -299,6 +304,8 @@ private function sendObjectNotification(
299304
* @param LoggerInterface $logger Logger
300305
*
301306
* @return void
307+
*
308+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-2
302309
*/
303310
private function sendReviewNotification(
304311
string $listUuid,

lib/BackgroundJob/DestructionExecutionJob.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
* @version GIT: <git_id>
1818
*
1919
* @link https://www.OpenRegister.app
20+
*
21+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-2
22+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-5
2023
*/
2124

2225
declare(strict_types=1);
@@ -72,6 +75,8 @@ public function __construct(ITimeFactory $time)
7275
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
7376
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
7477
* @SuppressWarnings(PHPMD.NPathComplexity)
78+
*
79+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-2
7580
*/
7681
protected function run($argument): void
7782
{
@@ -238,6 +243,8 @@ protected function run($argument): void
238243
* @param LoggerInterface $logger Logger
239244
*
240245
* @return void
246+
*
247+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-5
241248
*/
242249
private function notifySkippedHolds(
243250
string $listUuid,

lib/BackgroundJob/HookRetryJob.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
* @version GIT: <git-id>
1616
*
1717
* @link https://www.OpenRegister.app
18+
*
19+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-72
1820
*/
1921

2022
declare(strict_types=1);
@@ -83,6 +85,8 @@ public function __construct(
8385
* @return void
8486
*
8587
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
88+
*
89+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-72
8690
*/
8791
protected function run($argument): void
8892
{

lib/BackgroundJob/ScheduledWorkflowJob.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
* @version GIT: <git-id>
1616
*
1717
* @link https://www.OpenRegister.app
18+
*
19+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-83
1820
*/
1921

2022
declare(strict_types=1);
@@ -192,6 +194,8 @@ private function evaluateSchedule(ScheduledWorkflow $schedule): void
192194
* @param string $error Error message
193195
*
194196
* @return void
197+
*
198+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-83
195199
*/
196200
private function handleError(ScheduledWorkflow $schedule, $startTime, string $error): void
197201
{

lib/BackgroundJob/WebhookDeliveryJob.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
* @version GIT: <git-id>
1616
*
1717
* @link https://www.OpenRegister.app
18+
*
19+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-79
1820
*/
1921

2022
declare(strict_types=1);
@@ -118,6 +120,8 @@ public function __construct(
118120
* - attempt: Current attempt number (default: 1)
119121
*
120122
* @return void
123+
*
124+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-79
121125
*/
122126
protected function run($argument): void
123127
{

lib/Controller/ArchivalController.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
* @version GIT: <git_id>
1717
*
1818
* @link https://www.OpenRegister.app
19+
*
20+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-2
21+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-5
1922
*/
2023

2124
namespace OCA\OpenRegister\Controller;
@@ -131,6 +134,8 @@ public function __construct(
131134
* @return JSONResponse The list of destruction lists.
132135
*
133136
* @NoAdminRequired
137+
*
138+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-2
134139
*/
135140
public function listDestructionLists(): JSONResponse
136141
{
@@ -161,6 +166,8 @@ public function listDestructionLists(): JSONResponse
161166
* @return JSONResponse The destruction list detail.
162167
*
163168
* @NoAdminRequired
169+
*
170+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-2
164171
*/
165172
public function getDestructionList(string $id): JSONResponse
166173
{
@@ -191,6 +198,8 @@ public function getDestructionList(string $id): JSONResponse
191198
* @return JSONResponse The updated destruction list.
192199
*
193200
* @NoAdminRequired
201+
*
202+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-2
194203
*/
195204
public function approveDestructionList(string $id): JSONResponse
196205
{
@@ -258,6 +267,8 @@ public function approveDestructionList(string $id): JSONResponse
258267
* @return JSONResponse The updated destruction list.
259268
*
260269
* @NoAdminRequired
270+
*
271+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-2
261272
*/
262273
public function rejectDestructionList(string $id): JSONResponse
263274
{
@@ -439,6 +450,8 @@ public function releaseLegalHold(string $id): JSONResponse
439450
* @return JSONResponse The list of active legal holds.
440451
*
441452
* @NoAdminRequired
453+
*
454+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-5
442455
*/
443456
public function listLegalHolds(): JSONResponse
444457
{
@@ -463,6 +476,8 @@ public function listLegalHolds(): JSONResponse
463476
* @return JSONResponse The list of destruction certificates.
464477
*
465478
* @NoAdminRequired
479+
*
480+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-2
466481
*/
467482
public function listCertificates(): JSONResponse
468483
{
@@ -486,6 +501,8 @@ public function listCertificates(): JSONResponse
486501
* Check if the current user has the archivist role.
487502
*
488503
* @return JSONResponse|null Returns a 403 response if unauthorized, null if authorized.
504+
*
505+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-2
489506
*/
490507
private function checkArchivistRole(): ?JSONResponse
491508
{

lib/Controller/AuditTrailController.php

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
* @version GIT: <git-id>
1818
*
1919
* @link https://OpenRegister.app
20+
*
21+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-8
2022
*/
2123

2224
namespace OCA\OpenRegister\Controller;
@@ -67,6 +69,8 @@ public function __construct(
6769
*
6870
* @SuppressWarnings(PHPMD.NPathComplexity) Request parameter extraction requires many conditional checks
6971
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
72+
*
73+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-8
7074
*/
7175
private function extractRequestParameters(): array
7276
{
@@ -180,6 +184,8 @@ function ($key) {
180184
* array{results: array<\OCA\OpenRegister\Db\AuditTrail>,
181185
* total: int<0, max>, page: int|null, pages: float, limit: int,
182186
* offset: int|null}, array<never, never>>
187+
*
188+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-8
183189
*/
184190
public function index(): JSONResponse
185191
{
@@ -225,6 +231,8 @@ public function index(): JSONResponse
225231
* array{error: 'Audit trail not found'},
226232
* array<never, never>
227233
* >
234+
*
235+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-8
228236
*/
229237
public function show(int $id): JSONResponse
230238
{
@@ -247,6 +255,8 @@ public function show(int $id): JSONResponse
247255
* @NoCSRFRequired
248256
*
249257
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
258+
*
259+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-8
250260
*/
251261
public function update(int $id): JSONResponse
252262
{
@@ -274,6 +284,8 @@ public function update(int $id): JSONResponse
274284
* results?: array<\OCA\OpenRegister\Db\AuditTrail>,
275285
* total?: int<0, max>, page?: int|null, pages?: float, limit?: int,
276286
* offset?: int|null}, array<never, never>>
287+
*
288+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-8
277289
*/
278290
public function objects(string $register, string $schema, string $id): JSONResponse
279291
{
@@ -318,6 +330,8 @@ public function objects(string $register, string $schema, string $id): JSONRespo
318330
* @NoCSRFRequired
319331
*
320332
* @return JSONResponse JSON response with export data or error
333+
*
334+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-8
321335
*/
322336
public function export(): JSONResponse
323337
{
@@ -387,6 +401,8 @@ public function export(): JSONResponse
387401
* @NoCSRFRequired
388402
*
389403
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
404+
*
405+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-8
390406
*/
391407
public function destroy(int $id): JSONResponse
392408
{
@@ -404,6 +420,8 @@ public function destroy(int $id): JSONResponse
404420
* @NoCSRFRequired
405421
*
406422
* @return JSONResponse JSON response with deletion results or error
423+
*
424+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-8
407425
*/
408426
public function destroyMultiple(): JSONResponse
409427
{
@@ -462,6 +480,8 @@ public function destroyMultiple(): JSONResponse
462480
* @NoCSRFRequired
463481
*
464482
* @return JSONResponse JSON response confirming clear or error
483+
*
484+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-8
465485
*/
466486
public function clearAll(): JSONResponse
467487
{
@@ -506,6 +526,8 @@ public function clearAll(): JSONResponse
506526
* @NoCSRFRequired
507527
*
508528
* @return JSONResponse Verification result with valid/invalid status
529+
*
530+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-8
509531
*/
510532
public function verify(): JSONResponse
511533
{
@@ -538,6 +560,8 @@ public function verify(): JSONResponse
538560
* @return JSONResponse List of processing activities
539561
*
540562
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
563+
*
564+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-8
541565
*/
542566
public function verwerkingsregister(): JSONResponse
543567
{
@@ -564,6 +588,8 @@ public function verwerkingsregister(): JSONResponse
564588
* @NoCSRFRequired
565589
*
566590
* @return JSONResponse Matching audit trail entries grouped by schema
591+
*
592+
* @spec openspec/changes/retrofit-annotate-openregister-2026-04-23/tasks.md#task-8
567593
*/
568594
public function inzageverzoek(): JSONResponse
569595
{

0 commit comments

Comments
 (0)