Fixed phpcs Warnings

Author: remko48

lib/Controller/ConfigurationController.php

@@ -1242,7 +1242,8 @@ private function importFromSource(callable $fetchConfig, array $params, string $
 
             $configuration = $this->configurationMapper->insert($configuration);
 
-            $msg = '[ConfigurationController] Created configuration'." entity with ID {$configuration->getId()} for app {$appId}";
+            $configId = $configuration->getId();
+            $msg      = "[ConfigurationController] Created configuration entity with ID {$configId} for app {$appId}";
             $this->logger->info(
                 message: $msg,
                 context: ['file' => __FILE__, 'line' => __LINE__]
@@ -1267,7 +1268,8 @@ private function importFromSource(callable $fetchConfig, array $params, string $
             // But we need to save the sync status.
             $this->configurationMapper->update($configuration);
 
-            $msg = '[ConfigurationController] Successfully imported'." configuration {$configuration->getTitle()} from {$sourceType}";
+            $configTitle = $configuration->getTitle();
+            $msg         = "[ConfigurationController] Successfully imported configuration {$configTitle} from {$sourceType}";
             $this->logger->info(
                 message: $msg,
                 context: ['file' => __FILE__, 'line' => __LINE__]

lib/Controller/RegistersController.php

@@ -303,7 +303,9 @@ public function index(): JSONResponse
                             schemas: $expandedSchemas
                         );
 
-                        $msg = '[RegistersController] Schema counts for register '.$register['id'].': '.json_encode($schemaCounts);
+                        $registerId = $register['id'];
+                        $countsJson = json_encode($schemaCounts);
+                        $msg        = "[RegistersController] Schema counts for register {$registerId}: {$countsJson}";
                         $this->logger->debug(
                             message: $msg,
                             context: ['file' => __FILE__, 'line' => __LINE__]
@@ -326,7 +328,8 @@ public function index(): JSONResponse
                                 $schema['stats'] = [
                                     'objects' => $schemaCounts[$schemaId],
                                 ];
-                                $msg = '[RegistersController] Set stats for schema '."{$schemaId}: ".json_encode($schema['stats']);
+                                $statsJson       = json_encode($schema['stats']);
+                                $msg = "[RegistersController] Set stats for schema {$schemaId}: {$statsJson}";
                                 $this->logger->debug(
                                     message: $msg,
                                     context: ['file' => __FILE__, 'line' => __LINE__]

lib/Db/MagicMapper.php

@@ -298,7 +298,11 @@ public function __construct(
         self::$constructCount++;
         file_put_contents('/tmp/or-debug.log', "MagicMapper::__construct #".self::$constructCount."\n", FILE_APPEND);
         if (self::$constructCount > 2) {
-            file_put_contents('/tmp/or-debug.log', "CIRCULAR! Stack:\n".(new \Exception())->getTraceAsString()."\n", FILE_APPEND);
+            file_put_contents(
+                '/tmp/or-debug.log',
+                "CIRCULAR! Stack:\n".(new \Exception())->getTraceAsString()."\n",
+                FILE_APPEND
+            );
             return;
         }
 
@@ -878,8 +882,10 @@ public function getSimpleFacetsFromRegisterSchemaTable(array $query, Register $r
                 schemaSlug: $schema->getSlug()
             );
             if ($isMagicEnabled === true) {
+                // phpcs:ignore Generic.Files.LineLength.TooLong -- log message string cannot be shortened
+                $infoMsg = '[MagicMapper] Register+schema table does not exist but magic mapping enabled, creating table for facets';
                 $this->logger->info(
-                    message: '[MagicMapper] Register+schema table does not exist but magic mapping enabled, creating table for facets',
+                    message: $infoMsg,
                     context: [
                         'file'       => __FILE__,
                         'line'       => __LINE__,
@@ -1107,8 +1113,10 @@ private function searchAcrossMultipleTablesWithUnion(array $query, array $regist
                     schemaSlug: $schema->getSlug()
                 );
                 if ($isMagicEnabled === true) {
+                    // phpcs:ignore Generic.Files.LineLength.TooLong -- log message string cannot be shortened
+                    $infoMsg = '[MagicMapper] Register+schema table does not exist but magic mapping enabled, creating table for cross-search';
                     $this->logger->info(
-                        message: '[MagicMapper] Register+schema table does not exist but magic mapping enabled, creating table for cross-search',
+                        message: $infoMsg,
                         context: [
                             'file'       => __FILE__,
                             'line'       => __LINE__,
@@ -1607,6 +1615,7 @@ private function checkTableExistsInDatabase(string $tableName): bool
             $isPostgres = stripos($platform::class, 'PostgreSQL') !== false;
 
             if ($isPostgres === true) {
+                // phpcs:ignore Generic.Files.LineLength.TooLong -- SQL query cannot be shortened
                 $sql = "SELECT 1 FROM information_schema.tables WHERE table_name = ? AND table_schema = current_schema() LIMIT 1";
             } else {
                 // MySQL/MariaDB/SQLite.
@@ -1868,7 +1877,9 @@ public function syncTableForRegisterSchema(Register $register, Schema $schema):
             // Calculate regular properties (excluding metadata).
             $regularPropCount = count($requiredColumns) - $metadataCount;
 
-            $unchangedCount = count($currentColumns) - count($columnStats['columnsAdded']) - count($columnStats['columnsDropped']);
+            $addedCount     = count($columnStats['columnsAdded']);
+            $droppedCount   = count($columnStats['columnsDropped']);
+            $unchangedCount = count($currentColumns) - $addedCount - $droppedCount;
 
             $result = [
                 'success'               => true,
@@ -3158,8 +3169,10 @@ private function prepareObjectDataForTable(array $objectData, Register $register
                         && (($propertyConfig['items']['type'] ?? '') === 'file');
 
                     if ($isFileProperty === true && is_string($value) === true && strpos($value, 'data:') === 0) {
+                        // phpcs:ignore Generic.Files.LineLength.TooLong -- log message string cannot be shortened
+                        $warnMsg = '[MagicMapper] File property contains unprocessed base64 data URL - setting to null to prevent DB error';
                         $this->logger->warning(
-                            message: '[MagicMapper] File property contains unprocessed base64 data URL - setting to null to prevent DB error',
+                            message: $warnMsg,
                             context: [
                                 'file'         => __FILE__,
                                 'line'         => __LINE__,
@@ -3175,8 +3188,10 @@ private function prepareObjectDataForTable(array $objectData, Register $register
                         $cleanedArray = [];
                         foreach ($value as $item) {
                             if (is_string($item) === true && strpos($item, 'data:') === 0) {
+                                // phpcs:ignore Generic.Files.LineLength.TooLong -- log message string cannot be shortened
+                                $warnMsg = '[MagicMapper] Array file item contains unprocessed base64 data URL - skipping item';
                                 $this->logger->warning(
-                                    message: '[MagicMapper] Array file item contains unprocessed base64 data URL - skipping item',
+                                    message: $warnMsg,
                                     context: [
                                         'file'         => __FILE__,
                                         'line'         => __LINE__,
@@ -6253,7 +6268,8 @@ public function findByRelationBatchInSchema(
                     // PostgreSQL: Handle both array and object formats.
                     // - For arrays: use @> containment operator (can't use ? as it conflicts with PDO placeholders).
                     // - For objects: use jsonb_each_text to search values.
-                    $arrSql       = "(jsonb_typeof(_relations)='array' AND _relations @> to_jsonb(?::text))";
+                    $arrSql = "(jsonb_typeof(_relations)='array' AND _relations @> to_jsonb(?::text))";
+                    // phpcs:ignore Generic.Files.LineLength.TooLong -- SQL query cannot be shortened
                     $objSql       = "(jsonb_typeof(_relations)='object' AND EXISTS(SELECT 1 FROM jsonb_each_text(_relations) kv WHERE kv.value=?))";
                     $conditions[] = "({$arrSql} OR {$objSql})";
                     $params[]     = $uuid;
@@ -8104,11 +8120,12 @@ public function searchObjectsPaginated(
      *
      * @return array{results: ObjectEntity[], total: int, registers: array, schemas: array}
      *
-     * @SuppressWarnings(PHPMD.BooleanArgumentFlag)   Flags control security filtering behavior
+     * @SuppressWarnings(PHPMD.BooleanArgumentFlag)
+     *   Flags control security filtering behavior
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @psalm-suppress                                UnusedParam Parameters reserved for future per-schema security filtering.
+     * @psalm-suppress                                UnusedParam Reserved for future per-schema security filtering.
      */
     private function searchObjectsPaginatedMultiSchema(
         array $searchQuery,

lib/Db/MagicMapper/MagicFacetHandler.php

@@ -1960,8 +1960,9 @@ private function batchResolveUuidLabels(
                     );
                     $this->warmedFields[$fieldCacheKey] = true;
                 } catch (\Exception $e) {
+                    $eMsg = $e->getMessage();
                     $this->logger->warning(
-                        message: '[MagicFacetHandler] Failed to persist facet labels to distributed cache: '.$e->getMessage(),
+                        message: "[MagicFacetHandler] Failed to persist facet labels to distributed cache: {$eMsg}",
                         context: ['file' => __FILE__, 'line' => __LINE__]
                     );
                 }

lib/Service/AuthenticationService.php

@@ -409,7 +409,12 @@ public function fetchJWTToken(array $configuration): string
         $jwk     = $this->getJWK(configuration: $configuration);
 
         if (isset($configuration['x5t']) === true) {
-            return $this->generateJWT(payload: $payload, jwk: $jwk, algorithm: $configuration['algorithm'], x5t: $configuration['x5t']);
+            return $this->generateJWT(
+                payload: $payload,
+                jwk: $jwk,
+                algorithm: $configuration['algorithm'],
+                x5t: $configuration['x5t']
+            );
         }
 
         return $this->generateJWT(payload: $payload, jwk: $jwk, algorithm: $configuration['algorithm']);

lib/Service/Configuration/ImportHandler.php

@@ -75,8 +75,6 @@ class ImportHandler
      * which could trigger another dependency check. This flag prevents infinite recursion.
      *
      * @var boolean
-     *
-     * @SuppressWarnings(PHPMD.UnusedPrivateField)
      */
     private static bool $depCheckActive = false;
 
@@ -203,8 +201,6 @@ class ImportHandler
      * OpenConnector configuration service for optional integration.
      *
      * @var mixed The OpenConnector configuration service or null.
-     *
-     * @SuppressWarnings(PHPMD.UnusedPrivateField)
      */
     private mixed $connectorConfigSvc = null;