Skip to content

Commit 77f2f28

Browse files
remko48remko48
committed
Fixed phpcs
1 parent 03e7d96 commit 77f2f28

52 files changed

Lines changed: 366 additions & 342 deletions

Some content is hidden

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

‎lib/BackgroundJob/HookRetryJob.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class HookRetryJob extends QueuedJob
5555
* Constructor for HookRetryJob
5656
*
5757
* @param ITimeFactory $time Time factory
58-
* @param MagicMapper $objectEntityMapper Object mapper
58+
* @param MagicMapper $objectEntityMapper Object mapper
5959
* @param SchemaMapper $schemaMapper Schema mapper
6060
* @param WorkflowEngineRegistry $engineRegistry Engine registry
6161
* @param CloudEventFormatter $cloudEventFormatter CloudEvent formatter

‎lib/Controller/DeletedController.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ class DeletedController extends Controller
4444
/**
4545
* Constructor for the DeletedController
4646
*
47-
* @param string $appName The name of the app
48-
* @param IRequest $request The request object
49-
* @param MagicMapper $objectEntityMapper The object entity mapper
50-
* @param RegisterMapper $registerMapper The register mapper
51-
* @param SchemaMapper $schemaMapper The schema mapper
52-
* @param ObjectService $objectService The object service
53-
* @param IUserSession $userSession The user session
47+
* @param string $appName The name of the app
48+
* @param IRequest $request The request object
49+
* @param MagicMapper $objectEntityMapper The object entity mapper
50+
* @param RegisterMapper $registerMapper The register mapper
51+
* @param SchemaMapper $schemaMapper The schema mapper
52+
* @param ObjectService $objectService The object service
53+
* @param IUserSession $userSession The user session
5454
*
5555
* @return void
5656
*/

‎lib/Controller/HealthController.php‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,18 @@ public function index(): JSONResponse
7878
// Check filesystem.
7979
$checks['filesystem'] = $this->checkFilesystem();
8080
if ($checks['filesystem'] !== 'ok') {
81-
$status = ($status === 'error') ? 'error' : 'degraded';
81+
if ($status === 'error') {
82+
$status = 'error';
83+
} else {
84+
$status = 'degraded';
85+
}
8286
}
8387

84-
$httpStatus = ($status === 'ok') ? Http::STATUS_OK : Http::STATUS_SERVICE_UNAVAILABLE;
88+
if ($status === 'ok') {
89+
$httpStatus = Http::STATUS_OK;
90+
} else {
91+
$httpStatus = Http::STATUS_SERVICE_UNAVAILABLE;
92+
}
8593

8694
return new JSONResponse(
8795
[
@@ -109,7 +117,7 @@ private function checkDatabase(): string
109117
return 'ok';
110118
} catch (\Exception $e) {
111119
$this->logger->error('[HealthController] Database check failed', ['error' => $e->getMessage()]);
112-
return 'failed: ' . $e->getMessage();
120+
return 'failed: '.$e->getMessage();
113121
}
114122
}//end checkDatabase()
115123

@@ -121,7 +129,7 @@ private function checkDatabase(): string
121129
private function checkFilesystem(): string
122130
{
123131
try {
124-
$tmpFile = sys_get_temp_dir() . '/openregister_health_' . getmypid();
132+
$tmpFile = sys_get_temp_dir().'/openregister_health_'.getmypid();
125133
$written = file_put_contents($tmpFile, 'health');
126134
if ($written === false) {
127135
return 'failed: cannot write to temp directory';
@@ -131,7 +139,7 @@ private function checkFilesystem(): string
131139

132140
return 'ok';
133141
} catch (\Exception $e) {
134-
return 'failed: ' . $e->getMessage();
142+
return 'failed: '.$e->getMessage();
135143
}
136144
}//end checkFilesystem()
137145

‎lib/Controller/MetricsController.php‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ private function collectMetrics(): string
9191

9292
$lines[] = '# HELP openregister_info Application information';
9393
$lines[] = '# TYPE openregister_info gauge';
94-
$lines[] = 'openregister_info{version="' . $version . '",php_version="' . $phpVersion . '"} 1';
94+
$lines[] = 'openregister_info{version="'.$version.'",php_version="'.$phpVersion.'"} 1';
9595
$lines[] = '';
9696

9797
// App up gauge.
@@ -101,40 +101,40 @@ private function collectMetrics(): string
101101
$lines[] = '';
102102

103103
// Registers total.
104-
$registersTotal = $this->countTable('openregister_registers');
104+
$registersTotal = $this->countTable(table: 'openregister_registers');
105105
$lines[] = '# HELP openregister_registers_total Total number of registers';
106106
$lines[] = '# TYPE openregister_registers_total gauge';
107-
$lines[] = 'openregister_registers_total ' . $registersTotal;
107+
$lines[] = 'openregister_registers_total '.$registersTotal;
108108
$lines[] = '';
109109

110110
// Schemas total.
111-
$schemasTotal = $this->countTable('openregister_schemas');
111+
$schemasTotal = $this->countTable(table: 'openregister_schemas');
112112
$lines[] = '# HELP openregister_schemas_total Total number of schemas';
113113
$lines[] = '# TYPE openregister_schemas_total gauge';
114-
$lines[] = 'openregister_schemas_total ' . $schemasTotal;
114+
$lines[] = 'openregister_schemas_total '.$schemasTotal;
115115
$lines[] = '';
116116

117117
// Objects total (by register and schema).
118-
$lines[] = '# HELP openregister_objects_total Total objects by register and schema';
119-
$lines[] = '# TYPE openregister_objects_total gauge';
118+
$lines[] = '# HELP openregister_objects_total Total objects by register and schema';
119+
$lines[] = '# TYPE openregister_objects_total gauge';
120120
$objectCounts = $this->getObjectCountsByRegisterAndSchema();
121121
foreach ($objectCounts as $row) {
122-
$register = $this->sanitizeLabel($row['register_name'] ?? 'unknown');
123-
$schema = $this->sanitizeLabel($row['schema_name'] ?? 'unknown');
122+
$register = $this->sanitizeLabel(value: $row['register_name'] ?? 'unknown');
123+
$schema = $this->sanitizeLabel(value: $row['schema_name'] ?? 'unknown');
124124
$count = (int) $row['object_count'];
125-
$lines[] = 'openregister_objects_total{register="' . $register . '",schema="' . $schema . '"} ' . $count;
125+
$lines[] = 'openregister_objects_total{register="'.$register.'",schema="'.$schema.'"} '.$count;
126126
}
127127

128128
$lines[] = '';
129129

130130
// Search requests total (from metrics table if it exists).
131-
$searchCount = $this->countMetricsByType('search_');
131+
$searchCount = $this->countMetricsByType(typePrefix: 'search_');
132132
$lines[] = '# HELP openregister_search_requests_total Total search requests';
133133
$lines[] = '# TYPE openregister_search_requests_total counter';
134-
$lines[] = 'openregister_search_requests_total ' . $searchCount;
134+
$lines[] = 'openregister_search_requests_total '.$searchCount;
135135
$lines[] = '';
136136

137-
return implode("\n", $lines) . "\n";
137+
return implode("\n", $lines)."\n";
138138
}//end collectMetrics()
139139

140140
/**
@@ -156,7 +156,7 @@ private function countTable(string $table): int
156156

157157
return (int) ($row['cnt'] ?? 0);
158158
} catch (\Exception $e) {
159-
$this->logger->warning('[MetricsController] Failed to count table ' . $table, ['error' => $e->getMessage()]);
159+
$this->logger->warning('[MetricsController] Failed to count table '.$table, ['error' => $e->getMessage()]);
160160
return 0;
161161
}
162162
}//end countTable()
@@ -201,7 +201,7 @@ private function countMetricsByType(string $typePrefix): int
201201
$qb = $this->db->getQueryBuilder();
202202
$qb->select($qb->func()->count('*', 'cnt'))
203203
->from('openregister_metrics')
204-
->where($qb->expr()->like('metric_type', $qb->createNamedParameter($typePrefix . '%')));
204+
->where($qb->expr()->like('metric_type', $qb->createNamedParameter($typePrefix.'%')));
205205

206206
$result = $qb->executeQuery();
207207
$row = $result->fetch();

‎lib/Controller/ObjectsController.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -93,21 +93,21 @@ class ObjectsController extends Controller
9393
/**
9494
* Constructor for the ObjectsController
9595
*
96-
* @param string $appName The name of the app
97-
* @param IRequest $request The request object
98-
* @param IAppConfig $config The app configuration object
99-
* @param IAppManager $appManager The app manager
100-
* @param ContainerInterface $container The DI container
101-
* @param RegisterMapper $registerMapper The register mapper
102-
* @param SchemaMapper $schemaMapper The schema mapper
103-
* @param AuditTrailMapper $auditTrailMapper The audit trail mapper
104-
* @param ObjectService $objectService The object service
105-
* @param IUserSession $userSession The user session
106-
* @param IGroupManager $groupManager The group manager
107-
* @param ExportService $exportService The export service
108-
* @param ImportService $importService The import service
109-
* @param WebhookService $webhookService The webhook service (optional)
110-
* @param LoggerInterface $logger The logger (optional)
96+
* @param string $appName The name of the app
97+
* @param IRequest $request The request object
98+
* @param IAppConfig $config The app configuration object
99+
* @param IAppManager $appManager The app manager
100+
* @param ContainerInterface $container The DI container
101+
* @param RegisterMapper $registerMapper The register mapper
102+
* @param SchemaMapper $schemaMapper The schema mapper
103+
* @param AuditTrailMapper $auditTrailMapper The audit trail mapper
104+
* @param ObjectService $objectService The object service
105+
* @param IUserSession $userSession The user session
106+
* @param IGroupManager $groupManager The group manager
107+
* @param ExportService $exportService The export service
108+
* @param ImportService $importService The import service
109+
* @param WebhookService $webhookService The webhook service (optional)
110+
* @param LoggerInterface $logger The logger (optional)
111111
*
112112
* @return void
113113
*
@@ -525,7 +525,7 @@ private function getConfig(?string $_register=null, ?string $_schema=null, ?arra
525525
'offset' => $offset,
526526
'page' => $page,
527527
'filters' => $params,
528-
'sort' => $this->normalizeOrderParameter($params['order'] ?? $params['_order'] ?? []),
528+
'sort' => $this->normalizeOrderParameter(order: $params['order'] ?? $params['_order'] ?? []),
529529
'_search' => ($params['_search'] ?? null),
530530
'_extend' => $this->normalizeExtendParameter(extend: $params['extend'] ?? $params['_extend'] ?? null),
531531
'_fields' => ($params['fields'] ?? $params['_fields'] ?? null),
@@ -955,8 +955,8 @@ public function index(string $register, string $schema, ObjectService $objectSer
955955
$rbac = filter_var($params['rbac'] ?? true, FILTER_VALIDATE_BOOLEAN);
956956
// Check both _multi and multi params (URL uses _multi, but we also support multi).
957957
$multiExplicitlySet = isset($params['_multi']) || isset($params['multi']);
958-
$multi = filter_var($params['_multi'] ?? $params['multi'] ?? true, FILTER_VALIDATE_BOOLEAN);
959-
$deleted = filter_var($params['deleted'] ?? false, FILTER_VALIDATE_BOOLEAN);
958+
$multi = filter_var($params['_multi'] ?? $params['multi'] ?? true, FILTER_VALIDATE_BOOLEAN);
959+
$deleted = filter_var($params['deleted'] ?? false, FILTER_VALIDATE_BOOLEAN);
960960

961961
// Check if magic mapping is enabled for this register+schema.
962962
$registerEntity = $resolved['registerEntity'] ?? null;

‎lib/Controller/RegistersController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class RegistersController extends Controller
151151
* @param string $appName Application name
152152
* @param IRequest $request HTTP request object
153153
* @param RegisterService $registerService Register service for business logic
154-
* @param MagicMapper $objectEntityMapper Object entity mapper for database operations
154+
* @param MagicMapper $objectEntityMapper Object entity mapper for database operations
155155
* @param UploadService $uploadService Upload service for file uploads
156156
* @param LoggerInterface $logger Logger for error tracking
157157
* @param IUserSession $userSession User session service

‎lib/Controller/SchemasController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class SchemasController extends Controller
8282
* @param IRequest $request HTTP request object
8383
* @param IAppConfig $config App configuration for settings
8484
* @param SchemaMapper $schemaMapper Schema mapper for database operations
85-
* @param MagicMapper $objectEntityMapper Object entity mapper for object queries
85+
* @param MagicMapper $objectEntityMapper Object entity mapper for object queries
8686
* @param DownloadService $downloadService Download service for file downloads
8787
* @param UploadService $uploadService Upload service for file uploads
8888
* @param AuditTrailMapper $auditTrailMapper Audit trail mapper for log statistics

‎lib/Db/AbstractObjectMapper.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ abstract class AbstractObjectMapper
5757
* @param Register|null $register Optional register to filter by.
5858
* @param Schema|null $schema Optional schema to filter by.
5959
* @param bool $includeDeleted Whether to include deleted objects.
60-
* @param bool $_rbac Whether to apply RBAC checks (default: true).
61-
* @param bool $_multitenancy Whether to apply multitenancy filtering (default: true).
60+
* @param bool $_rbac Whether to apply RBAC checks (default: true).
61+
* @param bool $_multitenancy Whether to apply multitenancy filtering (default: true).
6262
*
6363
* @return ObjectEntity The found object.
6464
*
@@ -300,8 +300,8 @@ abstract public function getFacetableFieldsFromSchemas(array $baseQuery=[]): arr
300300
*
301301
* @param array $query Query parameters.
302302
* @param string|null $activeOrgUuid Active organisation UUID.
303-
* @param bool $_rbac Whether to apply RBAC checks.
304-
* @param bool $_multitenancy Whether to apply multitenancy filtering.
303+
* @param bool $_rbac Whether to apply RBAC checks.
304+
* @param bool $_multitenancy Whether to apply multitenancy filtering.
305305
* @param array|null $ids Array of IDs or UUIDs to filter by.
306306
* @param string|null $uses Value that must be present in relations.
307307
*
@@ -325,8 +325,8 @@ abstract public function searchObjects(
325325
*
326326
* @param array $query Query parameters.
327327
* @param string|null $activeOrgUuid Active organisation UUID.
328-
* @param bool $_rbac Whether to apply RBAC checks.
329-
* @param bool $_multitenancy Whether to apply multitenancy filtering.
328+
* @param bool $_rbac Whether to apply RBAC checks.
329+
* @param bool $_multitenancy Whether to apply multitenancy filtering.
330330
* @param array|null $ids Array of IDs or UUIDs to filter by.
331331
* @param string|null $uses Value that must be present in relations.
332332
*

‎lib/Db/AuditTrailMapper.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class AuditTrailMapper extends QBMapper
6161
/**
6262
* Constructor for the AuditTrailMapper
6363
*
64-
* @param IDBConnection $db The database connection
64+
* @param IDBConnection $db The database connection
6565
* @param \Psr\Container\ContainerInterface $container DI container for lazy mapper resolution
6666
*/
6767
public function __construct(
@@ -439,7 +439,7 @@ public function revertObject($identifier, $until=null, bool $overwriteVersion=fa
439439
{
440440
// Get the current object (lazy-resolved to avoid circular DI).
441441
$objectMapper = $this->container->get(MagicMapper::class);
442-
$object = $objectMapper->find($identifier);
442+
$object = $objectMapper->find($identifier);
443443

444444
// Get audit trail entries until the specified point.
445445
$auditTrails = $this->findByObjectUntil(

0 commit comments

Comments
 (0)