From 1e7dfd235204eaecdb5744152c11791972bc2150 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 9 Nov 2026 05:14:46 +0000 Subject: [PATCH 1/3] refactor(objects): the renderer takes three service bundles and its property guard RenderObject::__construct took 23 parameters. It now takes the stores it reads (mappers, files), the enrichers it adds (translations, derived values), the runtime it works in (logger, request, lazy container and the optional read extensions) and the property RBAC handler, which stays a direct parameter as an access guard. Every bundle is autowired; the nullable extensions keep their null defaults. Assisted-by: ClaudeCode --- lib/Service/Object/RenderDerivations.php | 52 +++ lib/Service/Object/RenderEnrichers.php | 44 +++ lib/Service/Object/RenderFileSources.php | 53 +++ lib/Service/Object/RenderMappers.php | 52 +++ lib/Service/Object/RenderObject.php | 241 +++++--------- lib/Service/Object/RenderReadExtensions.php | 53 +++ lib/Service/Object/RenderRuntime.php | 55 ++++ lib/Service/Object/RenderStores.php | 44 +++ lib/Service/Object/RenderTranslations.php | 52 +++ ...ObjectsControllerWriteOnlyListLeakTest.php | 51 +-- .../File/FileRestrictionRenderAndLinkTest.php | 53 +-- .../Object/RenderObjectCoverageTest.php | 51 +-- .../Service/Object/RenderObjectDeepTest.php | 51 +-- .../RenderObjectExtendReadCheckTest.php | 40 ++- .../RenderObjectFieldEncryptionTest.php | 55 ++-- .../RenderObjectInverseReadCheckTest.php | 53 +-- .../RenderObjectLanguageMetaGoldenTest.php | 53 +-- .../Object/RenderObjectLensRowsTest.php | 52 +-- .../RenderObjectNestedWriteOnlyPathsTest.php | 51 +-- .../RenderObjectPropertyReadCopiesTest.php | 51 +-- .../RenderObjectRenderEntityPhasesTest.php | 58 ++-- .../Unit/Service/Object/RenderObjectTest.php | 306 +++++++++++------- .../Object/RenderObjectUpdateRightTest.php | 57 ++-- .../RenderObjectWriteOnlyRedactionTest.php | 53 +-- 24 files changed, 1164 insertions(+), 517 deletions(-) create mode 100644 lib/Service/Object/RenderDerivations.php create mode 100644 lib/Service/Object/RenderEnrichers.php create mode 100644 lib/Service/Object/RenderFileSources.php create mode 100644 lib/Service/Object/RenderMappers.php create mode 100644 lib/Service/Object/RenderReadExtensions.php create mode 100644 lib/Service/Object/RenderRuntime.php create mode 100644 lib/Service/Object/RenderStores.php create mode 100644 lib/Service/Object/RenderTranslations.php diff --git a/lib/Service/Object/RenderDerivations.php b/lib/Service/Object/RenderDerivations.php new file mode 100644 index 000000000000..00564d1e3311 --- /dev/null +++ b/lib/Service/Object/RenderDerivations.php @@ -0,0 +1,52 @@ + + * @copyright 2026 Conduction B.V. + * @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 + * + * @version GIT: + * + * @link https://www.OpenRegister.nl + */ + +declare(strict_types=1); + +namespace OCA\OpenRegister\Service\Object; + +use OCA\OpenRegister\Service\Calculation\CalculationEvaluatorInterface; +use OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler; +use OCA\OpenRegister\Service\UrnService; + +/** + * What a render derives values and links with. + * + * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md + */ +final class RenderDerivations { + /** + * Bundle the services. + * + * @param ComputedFieldHandler $computedFieldHandler Evaluates computed fields. + * @param CalculationEvaluatorInterface $calculationEvaluator Evaluates derived properties. + * @param LinkedEntityEnricher $linkedEntityEnricher Enriches linked entity metadata. + * @param UrnService $urnService Resolves register, schema and object URNs. + * + * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md + */ + public function __construct( + public readonly ComputedFieldHandler $computedFieldHandler, + public readonly CalculationEvaluatorInterface $calculationEvaluator, + public readonly LinkedEntityEnricher $linkedEntityEnricher, + public readonly UrnService $urnService, + ) { + }//end __construct() +}//end class diff --git a/lib/Service/Object/RenderEnrichers.php b/lib/Service/Object/RenderEnrichers.php new file mode 100644 index 000000000000..648a1a29fcb1 --- /dev/null +++ b/lib/Service/Object/RenderEnrichers.php @@ -0,0 +1,44 @@ + + * @copyright 2026 Conduction B.V. + * @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 + * + * @version GIT: + * + * @link https://www.OpenRegister.nl + */ + +declare(strict_types=1); + +namespace OCA\OpenRegister\Service\Object; + +/** + * What a render adds to the stored data: translations and derived values. + * + * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md + */ +final class RenderEnrichers { + /** + * Bundle the services. + * + * @param RenderTranslations $translations The translation services. + * @param RenderDerivations $derivations The derivation services. + * + * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md + */ + public function __construct( + public readonly RenderTranslations $translations, + public readonly RenderDerivations $derivations, + ) { + }//end __construct() +}//end class diff --git a/lib/Service/Object/RenderFileSources.php b/lib/Service/Object/RenderFileSources.php new file mode 100644 index 000000000000..cff3b7e6a5fb --- /dev/null +++ b/lib/Service/Object/RenderFileSources.php @@ -0,0 +1,53 @@ + + * @copyright 2026 Conduction B.V. + * @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 + * + * @version GIT: + * + * @link https://www.OpenRegister.nl + */ + +declare(strict_types=1); + +namespace OCA\OpenRegister\Service\Object; + +use OCA\OpenRegister\Files\Db\FileMapperInterface; +use OCA\OpenRegister\Service\FileReaderInterface; +use OCP\SystemTag\ISystemTagManager; +use OCP\SystemTag\ISystemTagObjectMapper; + +/** + * Where a render reads an object's files and their tags. + * + * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md + */ +final class RenderFileSources { + /** + * Bundle the services. + * + * @param FileMapperInterface $fileMapper The file metadata store. + * @param FileReaderInterface $fileService The file reader. + * @param ISystemTagManager $systemTagManager The system tag manager. + * @param ISystemTagObjectMapper $systemTagMapper The system tag object mapper. + * + * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md + */ + public function __construct( + public readonly FileMapperInterface $fileMapper, + public readonly FileReaderInterface $fileService, + public readonly ISystemTagManager $systemTagManager, + public readonly ISystemTagObjectMapper $systemTagMapper, + ) { + }//end __construct() +}//end class diff --git a/lib/Service/Object/RenderMappers.php b/lib/Service/Object/RenderMappers.php new file mode 100644 index 000000000000..1b9df6a46a10 --- /dev/null +++ b/lib/Service/Object/RenderMappers.php @@ -0,0 +1,52 @@ + + * @copyright 2026 Conduction B.V. + * @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 + * + * @version GIT: + * + * @link https://www.OpenRegister.nl + */ + +declare(strict_types=1); + +namespace OCA\OpenRegister\Service\Object; + +use OCA\OpenRegister\Db\MagicMapperInterface; +use OCA\OpenRegister\Db\RegisterMapperInterface; +use OCA\OpenRegister\Db\SchemaMapperInterface; + +/** + * The stores a render reads registers, schemas and objects from. + * + * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md + */ +final class RenderMappers { + /** + * Bundle the services. + * + * @param MagicMapperInterface $objectEntityMapper The object store. + * @param RegisterMapperInterface $registerMapper The register store. + * @param SchemaMapperInterface $schemaMapper The schema store. + * @param CacheHandlerInterface $objectCacheService The object cache. + * + * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md + */ + public function __construct( + public readonly MagicMapperInterface $objectEntityMapper, + public readonly RegisterMapperInterface $registerMapper, + public readonly SchemaMapperInterface $schemaMapper, + public readonly CacheHandlerInterface $objectCacheService, + ) { + }//end __construct() +}//end class diff --git a/lib/Service/Object/RenderObject.php b/lib/Service/Object/RenderObject.php index 3c768e66ea94..898721e7b229 100644 --- a/lib/Service/Object/RenderObject.php +++ b/lib/Service/Object/RenderObject.php @@ -30,43 +30,24 @@ use Adbar\Dot; use Exception; -use OCA\OpenRegister\Files\Db\FileMapperInterface; -use OCA\OpenRegister\Db\MagicMapperInterface; use OCA\OpenRegister\Db\ObjectEntity; use OCA\OpenRegister\Db\Register; -use OCA\OpenRegister\Db\RegisterMapperInterface; use OCA\OpenRegister\Db\Schema; -use OCA\OpenRegister\Db\SchemaMapperInterface; use OCA\OpenRegister\Db\Translation; -use OCA\OpenRegister\Db\TranslationMapperInterface; use OCA\OpenRegister\Formats\UuidFormat; -use OCA\OpenRegister\Service\Calculation\CalculationEvaluatorInterface; use OCA\OpenRegister\Service\Calculation\CalculationPayload; use OCA\OpenRegister\Service\Deletion\RetentionClockService; use OCA\OpenRegister\Service\ObjectAction\ObjectActionList; -use OCA\OpenRegister\Service\FieldEncryptionHandler; -use OCA\OpenRegister\Service\Hinge\LensResolver; use OCA\OpenRegister\Service\Interaction\ReadStateService; use OCA\OpenRegister\Service\Interaction\WatcherService; use OCA\OpenRegister\Files\Service\File\FileRestrictionGuardInterface; -use OCA\OpenRegister\Service\FileReaderInterface; -use OCA\OpenRegister\Service\LanguageService; -use OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler; -use OCA\OpenRegister\Service\ObjectSource\ObjectSourceRegistry; use OCA\OpenRegister\Service\PropertyRbacHandler; use OCA\OpenRegister\Service\SystemOperationContext; -use OCA\OpenRegister\Service\TranslationStatusService; use OCA\OpenRegister\Service\Registry\RegistrySubscriptionService; use OCA\OpenRegister\Service\Relation\LinkExposure; use OCA\OpenRegister\Service\Relation\RelationTypeResolver; -use Psr\Container\ContainerInterface; -use OCA\OpenRegister\Service\UrnService; use OCA\OpenRegister\Service\Rbac\ExplicitReveal; use OCA\OpenRegister\Service\Rbac\ExplicitRevealMasker; -use OCP\IRequest; -use OCP\SystemTag\ISystemTagManager; -use OCP\SystemTag\ISystemTagObjectMapper; -use Psr\Log\LoggerInterface; use Symfony\Component\Uid\Uuid; use WeakMap; @@ -224,67 +205,19 @@ class RenderObject implements RenderObjectInterface { /** * Constructor for RenderObject handler. * - * @param FileMapperInterface $fileMapper File mapper for database operations. - * @param MagicMapperInterface $objectEntityMapper Object entity mapper for database operations. - * @param RegisterMapperInterface $registerMapper Register mapper for database operations. - * @param SchemaMapperInterface $schemaMapper Schema mapper for database operations. - * @param ISystemTagManager $systemTagManager System tag manager for file tags. - * @param ISystemTagObjectMapper $systemTagMapper System tag object mapper for file tags. - * @param CacheHandlerInterface $objectCacheService Object cache service for optimized loading. - * @param PropertyRbacHandler $propertyRbacHandler Property-level RBAC handler. - * @param LoggerInterface $logger Logger for performance monitoring. - * @param FileReaderInterface $fileService File service for file operations. - * @param ComputedFieldHandler $computedFieldHandler Handler for computed field evaluation. - * @param TranslationHandler $translationHandler Handler for translatable property resolution. - * @param LinkedEntityEnricher $linkedEntityEnricher Enricher for linked entity metadata. - * @param CalculationEvaluatorInterface $calculationEvaluator Evaluator for derived/computed properties. - * @param UrnService $urnService URN resolver for register/schema/object identifiers. - * @param TranslationStatusService $translationStatusService Service exposing per-object translation status metadata. - * @param TranslationMapperInterface $translationMapper Translation mapper for database operations. - * @param LanguageService $languageService Language service for source-language resolution. - * @param IRequest|null $request Current request, used to read `?recurrenceOccurrences=N`. - * @param ObjectSourceRegistry|null $objectSourceRegistry Resolves object-source providers for `$ref` extends into virtual schemas. - * @param FieldEncryptionHandler|null $fieldEncryptionHandler Field-level encryption handler (x-openregister-encrypted). - * @param ContainerInterface|null $container Lazily resolves RegistrySubscriptionService - * (registry-subscriptions) — NOT constructor-injected directly: that dependency - * chains ObjectService -> RenderObject -> RegistrySubscriptionService -> ObjectService, - * a cycle Nextcloud's container refuses to construct eagerly. Same lazy-resolution - * pattern PermissionHandlerInterface already uses for the same reason. - * @param LensResolver|null $lensResolver Resolves a schema's declared lenses at read time - * (objects-as-the-hinge-between-cases). Nullable-with-a-default because this class is - * constructed by hand in several tests, where a new required argument is a fatal; a - * null resolver leaves the data exactly as it was, which is what a schema declaring - * no lens gets anyway. - * - * @SuppressWarnings(PHPMD.ExcessiveParameterList) All parameters are DI-injected dependencies + * @param RenderStores $stores Where stored registers, schemas, objects and files are read. + * @param RenderEnrichers $enrichers Translations and derived values added to the stored data. + * @param RenderRuntime $runtime The logger, request, lazy container and read extensions. + * @param PropertyRbacHandler $propertyRbacHandler Property-level RBAC handler (the access guard stays direct). * * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md * @spec openspec/specs/field-level-encryption/spec.md#requirement-authorized-reads-are-decrypted-unauthorized-reads-never-see-ciphertext */ public function __construct( - private readonly FileMapperInterface $fileMapper, - private readonly MagicMapperInterface $objectEntityMapper, - private readonly RegisterMapperInterface $registerMapper, - private readonly SchemaMapperInterface $schemaMapper, - private readonly ISystemTagManager $systemTagManager, - private readonly ISystemTagObjectMapper $systemTagMapper, - private readonly CacheHandlerInterface $objectCacheService, + private readonly RenderStores $stores, + private readonly RenderEnrichers $enrichers, + private readonly RenderRuntime $runtime, private readonly PropertyRbacHandler $propertyRbacHandler, - private readonly LoggerInterface $logger, - private readonly FileReaderInterface $fileService, - private readonly ComputedFieldHandler $computedFieldHandler, - private readonly TranslationHandler $translationHandler, - private readonly LinkedEntityEnricher $linkedEntityEnricher, - private readonly CalculationEvaluatorInterface $calculationEvaluator, - private readonly UrnService $urnService, - private readonly TranslationStatusService $translationStatusService, - private readonly TranslationMapperInterface $translationMapper, - private readonly LanguageService $languageService, - private readonly ?IRequest $request = null, - private readonly ?ObjectSourceRegistry $objectSourceRegistry = null, - private readonly ?FieldEncryptionHandler $fieldEncryptionHandler = null, - private readonly ?ContainerInterface $container = null, - private readonly ?LensResolver $lensResolver = null, ) { }//end __construct() @@ -304,7 +237,7 @@ private function getRegister(int|string $id): ?Register { } try { - $register = $this->registerMapper->find($id); + $register = $this->stores->mappers->registerMapper->find($id); // Cache the result. $this->registersCache[$id] = $register; return $register; @@ -331,7 +264,7 @@ private function getSchema(int|string $id): ?Schema { try { // Bypass multi-tenancy for internal schema resolution — schemas must always // be accessible when resolving references, regardless of the current user's organization. - $schema = $this->schemaMapper->find($id, _multitenancy: false); + $schema = $this->stores->mappers->schemaMapper->find($id, _multitenancy: false); // Cache the result. $this->schemasCache[$id] = $schema; return $schema; @@ -457,7 +390,7 @@ private function loadReadableObject(int|string $id): ?ObjectEntity { } // Use cache service for optimized loading (only if not in ultra cache). - $object = $this->objectCacheService->getObject($id); + $object = $this->stores->mappers->objectCacheService->getObject($id); if ($object === null) { return null; } @@ -612,7 +545,7 @@ private function readableFileIdsOf(array $uuids): array { return []; } - return $this->readableFileIds(idsByUuid: $this->fileMapper->getFileIdsForObjects($uniqueUuids)); + return $this->readableFileIds(idsByUuid: $this->stores->files->fileMapper->getFileIdsForObjects($uniqueUuids)); }//end readableFileIdsOf() /** @@ -649,7 +582,7 @@ public function resolveTranslationsForRows(array &$rows): void { // Fast global skip: when `?_translations=all` is requested, no projection // happens at all — resolveTranslationsForRender early-returns per row, but // we short-circuit here to avoid resolving schemas/registers needlessly. - if ($this->languageService->shouldReturnAllTranslations() === true) { + if ($this->enrichers->translations->languageService->shouldReturnAllTranslations() === true) { return; } @@ -707,7 +640,7 @@ private function translateEntityRow(ObjectEntity $row): void { } $row->setObject( - $this->translationHandler->resolveTranslationsForRender(objectData: $row->getObject(), schema: $schema, register: $register) + $this->enrichers->translations->translationHandler->resolveTranslationsForRender(objectData: $row->getObject(), schema: $schema, register: $register) ); }//end translateEntityRow() @@ -726,7 +659,7 @@ private function translateArrayRow(array $row): array { return $row; } - return $this->translationHandler->resolveTranslationsForRender( + return $this->enrichers->translations->translationHandler->resolveTranslationsForRender( objectData: $row, schema: $schema, register: $this->arrayRowRegister(row: $row) @@ -787,7 +720,7 @@ private function arrayRowRegister(array $row): ?Register { * @spec openspec/specs/object-lenses/spec.md */ public function applyLensesToRows(array &$rows, bool $_rbac=true): void { - if ($this->lensResolver === null) { + if ($this->runtime->extensions->lensResolver === null) { return; } @@ -931,10 +864,10 @@ private function planRowRedaction(RowRedaction $pass, int|string $schemaId): voi */ private function decryptRedactedRow(RowRedaction $pass, array $data): array { if ($pass->doGated === true - && $this->fieldEncryptionHandler !== null + && $this->runtime->extensions->fieldEncryptionHandler !== null && $pass->schema->hasEncryptedProperties() === true ) { - return $this->fieldEncryptionHandler->decryptProperties(data: $data, schema: $pass->schema); + return $this->runtime->extensions->fieldEncryptionHandler->decryptProperties(data: $data, schema: $pass->schema); } return $data; @@ -1108,8 +1041,8 @@ private function removedProperties(array $before, array $after): array { * @return ExplicitRevealMasker|null */ private function revealMasker(): ?ExplicitRevealMasker { - if ($this->revealMasker === null && $this->container !== null) { - $this->revealMasker = $this->container->get(ExplicitRevealMasker::class); + if ($this->revealMasker === null && $this->runtime->container !== null) { + $this->revealMasker = $this->runtime->container->get(ExplicitRevealMasker::class); } return $this->revealMasker; @@ -1461,7 +1394,7 @@ private function setLightweightFileIds(ObjectEntity $entity): ObjectEntity { return $entity; } - $idsByUuid = $this->readableFileIds(idsByUuid: $this->fileMapper->getFileIdsForObjects([$uuid])); + $idsByUuid = $this->readableFileIds(idsByUuid: $this->stores->files->fileMapper->getFileIdsForObjects([$uuid])); $entity->setFiles($idsByUuid[$uuid] ?? []); return $entity; }//end setLightweightFileIds() @@ -1484,7 +1417,7 @@ private function setLightweightFileIds(ObjectEntity $entity): ObjectEntity { */ private function renderFiles(ObjectEntity $object): ObjectEntity { // Use FileMapper to get files for the object (handles folder property and UUID fallback). - $fileRecords = $this->withoutRestrictedFiles(fileRecords: $this->fileMapper->getFilesForObject($object)); + $fileRecords = $this->withoutRestrictedFiles(fileRecords: $this->stores->files->fileMapper->getFilesForObject($object)); // If no files found, set empty array and return. if (empty($fileRecords) === true) { @@ -1517,7 +1450,7 @@ private function tagLabels(array $fileIds): array { // finds the row stored under 123. // phpcs:ignore Squiz.Commenting.InlineComment.DocBlock -- PHPStan only reads @var from a /** */ block. /** @var array> $tagIdsPerFile */ - $tagIdsPerFile = $this->systemTagMapper->getTagIdsForObjects(objIds: $fileIds, objectType: 'files'); + $tagIdsPerFile = $this->stores->files->systemTagMapper->getTagIdsForObjects(objIds: $fileIds, objectType: 'files'); $tagNames = $this->visibleTagNames(tagIdsPerFile: $tagIdsPerFile); $labels = []; @@ -1550,7 +1483,7 @@ private function getFileTags(string $fileId): array { return $this->fileTagsCache[$fileId]; } - $tagIds = $this->systemTagMapper->getTagIdsForObjects(objIds: [$fileId], objectType: 'files'); + $tagIds = $this->stores->files->systemTagMapper->getTagIdsForObjects(objIds: [$fileId], objectType: 'files'); // PERF-1: back-fill the request cache. $this->fileTagsCache[$fileId] = $this->fileTagNames(tagIds: ($tagIds[$fileId] ?? [])); @@ -1569,7 +1502,7 @@ private function fileTagNames(array $tagIds): array { return []; } - $tags = $this->systemTagManager->getTagsByIds(tagIds: $tagIds); + $tags = $this->stores->files->systemTagManager->getTagsByIds(tagIds: $tagIds); $names = array_map(static fn ($tag) => $tag->getName(), $tags); return array_values(array_filter($names, static fn ($name) => !str_starts_with($name, 'object:'))); @@ -1843,7 +1776,7 @@ private function readableFile(int $fileId) { return null; } - return $this->fileService->getFileById($fileId); + return $this->stores->files->fileService->getFileById($fileId); }//end readableFile() /** @@ -1865,7 +1798,7 @@ private function exceedsBase64Cap($file, int $fileId): bool { return false; } - $this->logger->warning( + $this->runtime->logger->warning( message: '[RenderObject] Refusing to base64-embed oversized file', context: ['file' => __FILE__, 'line' => __LINE__, 'fileId' => $fileId, 'size' => $fileSize, 'cap' => self::MAX_BASE64_BYTES] ); @@ -1883,7 +1816,7 @@ private function fileSizeOf($file): int { try { return (int)$file->getSize(); } catch (\Throwable $sizeError) { - $this->logger->debug( + $this->runtime->logger->debug( '[RenderObject] Could not determine file size for base64 cap: ' . $sizeError->getMessage() ); return 0; @@ -2030,7 +1963,7 @@ private function cachedFileObject(string $fileId): ?array { * @return array|null The file object, or null when there is no such file. */ private function loadFileObject(string $fileId): ?array { - $fileRecord = $this->fileMapper->getFile((int)$fileId); + $fileRecord = $this->stores->files->fileMapper->getFile((int)$fileId); if (empty($fileRecord) === true) { return null; } @@ -2050,11 +1983,11 @@ private function loadFileObject(string $fileId): ?array { * @spec openspec/specs/file-actions/spec.md#requirement-every-openregister-file-path-honours-the-restriction-req-pfrr-003 */ private function withoutRestrictedFiles(array $fileRecords): array { - if ($this->container === null || $fileRecords === []) { + if ($this->runtime->container === null || $fileRecords === []) { return $fileRecords; } - $verdicts = $this->container->get(FileRestrictionGuardInterface::class)->readable( + $verdicts = $this->runtime->container->get(FileRestrictionGuardInterface::class)->readable( fileIds: array_map(static fn (array $record): int => (int)($record['fileid'] ?? 0), $fileRecords) ); @@ -2629,7 +2562,7 @@ private function applyReadRule(bool $rbac, bool $multitenancy): void { */ private function extendReads(): ExtendTargetReads { $this->extendTargetReads ??= new ExtendTargetReads( - mapper: $this->objectEntityMapper, + mapper: $this->stores->mappers->objectEntityMapper, mayRead: fn (ObjectEntity $object): bool => $this->mayReadInverse(object: $object) ); @@ -2650,7 +2583,7 @@ private function extendReads(): ExtendTargetReads { * @spec openspec/specs/rbac-scopes/spec.md */ private function readableExtendTargets(array $objects): array { - if ($this->container === null || $this->extendReads()->checked() === false || SystemOperationContext::isActive() === true) { + if ($this->runtime->container === null || $this->extendReads()->checked() === false || SystemOperationContext::isActive() === true) { return $objects; } @@ -2694,7 +2627,7 @@ private function cacheExtendTargets(array $objects): void { * @spec openspec/specs/rbac-scopes/spec.md */ private function readableInverseObjects(array $objects): array { - if ($this->container === null || $this->extendReads()->checked() === false) { + if ($this->runtime->container === null || $this->extendReads()->checked() === false) { return $objects; } @@ -2722,7 +2655,7 @@ private function mayReadInverse(ObjectEntity $object): bool { $owner = null; } - return $this->container->get(PermissionHandlerInterface::class)->hasPermission( + return $this->runtime->container->get(PermissionHandlerInterface::class)->hasPermission( schema: $schema, action: 'read', objectOwner: $owner, @@ -2887,7 +2820,7 @@ private function enrichLinkedEntities(ObjectEntity $entity, array|string|null $e return; } - $enriched = $this->linkedEntityEnricher->enrich($entity->jsonSerialize(), $linkedExtend); + $enriched = $this->enrichers->derivations->linkedEntityEnricher->enrich($entity->jsonSerialize(), $linkedExtend); foreach (array_keys($linkedExtend) as $key) { if (isset($enriched[$key]) === true) { $setter = 'set'.ucfirst(ltrim($key, '_')); @@ -2916,8 +2849,8 @@ private function applyReadTimeValues(ObjectEntity $entity, ?Schema $schema, arra return $objectData; } - if ($this->computedFieldHandler->hasComputedProperties($schema) === true) { - $objectData = $this->computedFieldHandler->evaluateComputedFields( + if ($this->enrichers->derivations->computedFieldHandler->hasComputedProperties($schema) === true) { + $objectData = $this->enrichers->derivations->computedFieldHandler->evaluateComputedFields( data: $objectData, schema: $schema, evaluateOn: 'read' @@ -2925,7 +2858,7 @@ private function applyReadTimeValues(ObjectEntity $entity, ?Schema $schema, arra $entity->setObject($objectData); } - $objectData = (new RecurrenceOccurrences(request: $this->request))->enrich(objectData: $objectData, schema: $schema); + $objectData = (new RecurrenceOccurrences(request: $this->runtime->request))->enrich(objectData: $objectData, schema: $schema); $entity->setObject($objectData); return $objectData; @@ -3066,11 +2999,11 @@ private function stripWriteOnlyRelationsMirror(ObjectEntity $entity, ?Schema $sc * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md */ private function decryptRenderedProperties(?Schema $schema, array $objectData): array { - if ($this->fieldEncryptionHandler === null || $schema === null || $schema->hasEncryptedProperties() === false) { + if ($this->runtime->extensions->fieldEncryptionHandler === null || $schema === null || $schema->hasEncryptedProperties() === false) { return $objectData; } - return $this->fieldEncryptionHandler->decryptProperties(data: $objectData, schema: $schema); + return $this->runtime->extensions->fieldEncryptionHandler->decryptProperties(data: $objectData, schema: $schema); }//end decryptRenderedProperties() /** @@ -3095,7 +3028,7 @@ private function resolveRenderTranslations(ObjectEntity $entity, ?Schema $schema return $objectData; } - $objectData = $this->translationHandler->resolveTranslationsForRender( + $objectData = $this->enrichers->translations->translationHandler->resolveTranslationsForRender( objectData: $objectData, schema: $schema, register: $register @@ -3150,7 +3083,7 @@ private function applyRequestedCalculations( return $objectData; } - $calculations = new VirtualCalculations(evaluator: $this->calculationEvaluator, logger: $this->logger); + $calculations = new VirtualCalculations(evaluator: $this->enrichers->derivations->calculationEvaluator, logger: $this->runtime->logger); return array_replace( $objectData, @@ -3179,11 +3112,11 @@ private function applyRequestedCalculations( * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md */ private function applyLens(?Schema $schema, array $objectData, bool $rbac): array { - if ($this->lensResolver === null) { + if ($this->runtime->extensions->lensResolver === null) { return $objectData; } - return $this->lensResolver->apply(schema: $schema, data: $objectData, _rbac: $rbac); + return $this->runtime->extensions->lensResolver->apply(schema: $schema, data: $objectData, _rbac: $rbac); }//end applyLens() /** @@ -3208,7 +3141,7 @@ private function applyRenderMarkers(ObjectEntity $entity, ?Schema $schema, array $this->applyWatcherMarkers(entity: $entity); $this->applyReadStateMarkers(entity: $entity); $this->applyUpdateRightMarker(entity: $entity, schema: $schema, extend: $extend); - $annotations = new RecordAnnotations(logger: $this->logger); + $annotations = new RecordAnnotations(logger: $this->runtime->logger); $annotations->attachRetention(entity: $entity, schema: $schema); $annotations->attachDecision(entity: $entity); $this->applyRetentionClocks(entity: $entity); @@ -3226,7 +3159,7 @@ private function applyRenderMarkers(ObjectEntity $entity, ?Schema $schema, array */ private function applyUrn(ObjectEntity $entity): void { try { - $entity->setUrn($this->urnService->buildForObject($entity)); + $entity->setUrn($this->enrichers->derivations->urnService->buildForObject($entity)); } catch (\Throwable $e) { $this->logRenderFailure(failure: 'URN derivation failed for object', entity: $entity, error: $e); } @@ -3265,7 +3198,7 @@ private function applyTranslationCompleteness(ObjectEntity $entity, ?Schema $sch * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md */ private function setTranslationCompleteness(ObjectEntity $entity, Schema $schema): void { - $completeness = $this->translationStatusService->completenessForObject((string) $entity->getUuid(), $schema); + $completeness = $this->enrichers->translations->translationStatusService->completenessForObject((string) $entity->getUuid(), $schema); if (count($completeness) > 0) { $entity->setTranslationCompleteness($completeness); } @@ -3304,11 +3237,11 @@ private function applyRegistryState(ObjectEntity $entity, ?Schema $schema): void * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md */ private function setRegistryState(ObjectEntity $entity, Schema $schema): void { - if ($this->container === null) { + if ($this->runtime->container === null) { return; } - $registrySubscriptions = $this->container->get(RegistrySubscriptionService::class); + $registrySubscriptions = $this->runtime->container->get(RegistrySubscriptionService::class); if ($registrySubscriptions->annotationFor(schema: $schema) === null) { return; } @@ -3331,7 +3264,7 @@ private function setRegistryState(ObjectEntity $entity, Schema $schema): void { * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md */ private function logRenderFailure(string $failure, ObjectEntity $entity, \Throwable $error): void { - $this->logger->debug( + $this->runtime->logger->debug( sprintf('[RenderObject] %s %s: %s', $failure, (string) $entity->getUuid(), $error->getMessage()) ); }//end logRenderFailure() @@ -3368,7 +3301,7 @@ private function attachFieldRules(ObjectEntity $entity, Schema $schema, array $s } catch (\Throwable $e) { // The hint is a courtesy on a read. Losing it must never cost the // object, and the save path refuses the same write either way. - $this->logger->debug( + $this->runtime->logger->debug( sprintf( '[RenderObject] field rules could not be resolved for %s: %s', (string)$entity->getUuid(), @@ -3406,7 +3339,7 @@ private function attachFieldRules(ObjectEntity $entity, Schema $schema, array $s * @spec openspec/specs/deletion-audit-trail/spec.md */ private function applyRetentionClocks(ObjectEntity $entity): void { - if ($this->container === null) { + if ($this->runtime->container === null) { return; } @@ -3417,10 +3350,10 @@ private function applyRetentionClocks(ObjectEntity $entity): void { } try { - $clocks = $this->container->get(RetentionClockService::class); + $clocks = $this->runtime->container->get(RetentionClockService::class); $entity->setRetentionClocks($clocks->clocksFor(object: $entity)); } catch (\Throwable $e) { - $this->logger->debug( + $this->runtime->logger->debug( sprintf( '[RenderObject] retention clocks skipped for %s: %s', (string)$entity->getUuid(), @@ -3453,7 +3386,7 @@ private function applyRetentionClocks(ObjectEntity $entity): void { * @spec openspec/specs/object-interactions/spec.md#requirement-a-user-can-watch-an-object-they-may-read */ private function applyWatcherMarkers(ObjectEntity $entity): void { - if ($this->container === null) { + if ($this->runtime->container === null) { return; } @@ -3466,7 +3399,7 @@ private function applyWatcherMarkers(ObjectEntity $entity): void { $this->setWatcherMarkers(entity: $entity, uuid: $uuid); } catch (\Throwable $e) { // A subscription lookup must never take out object rendering. - $this->logger->debug( + $this->runtime->logger->debug( sprintf('[RenderObject] watcher markers skipped for %s: %s', $uuid, $e->getMessage()) ); } @@ -3483,7 +3416,7 @@ private function applyWatcherMarkers(ObjectEntity $entity): void { * @spec openspec/specs/object-interactions/spec.md#requirement-a-user-can-watch-an-object-they-may-read */ private function setWatcherMarkers(ObjectEntity $entity, string $uuid): void { - $watchers = $this->container->get(WatcherService::class); + $watchers = $this->runtime->container->get(WatcherService::class); // Anonymous reads get no marker at all: there is no "you" to answer // for, and a hard false would read as "you do not follow this", @@ -3530,7 +3463,7 @@ private function setWatcherMarkers(ObjectEntity $entity, string $uuid): void { * @spec openspec/specs/object-read-state/spec.md#requirement-unread-is-a-filter-and-a-badge-resolved-in-the-query-req-ors-002 */ private function applyReadStateMarkers(ObjectEntity $entity): void { - if ($this->container === null) { + if ($this->runtime->container === null) { return; } @@ -3540,7 +3473,7 @@ private function applyReadStateMarkers(ObjectEntity $entity): void { } try { - $readState = $this->container->get(ReadStateService::class); + $readState = $this->runtime->container->get(ReadStateService::class); // Anonymous reads get no marker at all: there is no "you" to answer // for, and a hard false would read as "you have seen this", which is @@ -3552,7 +3485,7 @@ private function applyReadStateMarkers(ObjectEntity $entity): void { $entity->setUnread($readState->isUnreadForCaller(objectUuid: $uuid)); } catch (\Throwable $e) { // A read-state lookup must never take out object rendering. - $this->logger->debug( + $this->runtime->logger->debug( sprintf('[RenderObject] read state markers skipped for %s: %s', $uuid, $e->getMessage()) ); }//end try @@ -3585,7 +3518,7 @@ private function applyUpdateRightMarker(ObjectEntity $entity, ?Schema $schema, a try { $this->setRightsMarker(entity: $entity, schema: $schema); } catch (\Throwable $e) { - $this->logger->debug( + $this->runtime->logger->debug( sprintf('[RenderObject] update right marker skipped for %s: %s', (string)$entity->getUuid(), $e->getMessage()) ); } @@ -3619,17 +3552,17 @@ private static function asksForRights(array|string|null $extend): bool { * @spec openspec/specs/objects-crud/spec.md#requirement-req-rfce-002-a-cell-in-the-records-list-can-be-edited-in-place */ private function setRightsMarker(ObjectEntity $entity, Schema $schema): void { - if ($this->container === null) { + if ($this->runtime->container === null) { return; } - $permissions = $this->container->get(PermissionHandlerInterface::class); + $permissions = $this->runtime->container->get(PermissionHandlerInterface::class); $owner = $entity->getOwner(); if (is_string($owner) === false) { $owner = null; } - $can = $this->container->get(ObjectActionList::class)->canRun(object: $entity, schema: $schema); + $can = $this->runtime->container->get(ObjectActionList::class)->canRun(object: $entity, schema: $schema); $can['update'] = $permissions->hasPermission( schema: $schema, action: 'update', @@ -3648,11 +3581,11 @@ private function setRightsMarker(ObjectEntity $entity, Schema $schema): void { * @spec openspec/specs/i18n-source-of-truth/spec.md */ private function shouldAttachLanguageMeta(): bool { - if ($this->request === null) { + if ($this->runtime->request === null) { return false; } - $raw = $this->request->getParam('_translationMeta', null); + $raw = $this->runtime->request->getParam('_translationMeta', null); if ($raw === null) { return false; } @@ -3708,12 +3641,12 @@ private function attachLanguageMeta(array $objectData, LanguageMetaSubject $subj * @spec openspec/specs/i18n-source-of-truth/spec.md */ private function languageMetaFor(LanguageMetaSubject $subject): array { - $translatableProps = $this->translationHandler->getTranslatableProperties($subject->schema); + $translatableProps = $this->enrichers->translations->translationHandler->getTranslatableProperties($subject->schema); if (count($translatableProps) === 0) { return []; } - $served = $this->languageService->getPreferredLanguage(); + $served = $this->enrichers->translations->languageService->getPreferredLanguage(); $languageMeta = []; foreach ($translatableProps as $property) { $sourceLanguage = $this->resolveSourceLanguageForProperty( @@ -3763,7 +3696,7 @@ private function withSidecarStatus(array $languageMeta, string $uuid): array { } try { - $row = $this->translationMapper->findOne($uuid, $property, $entry['served']); + $row = $this->enrichers->translations->translationMapper->findOne($uuid, $property, $entry['served']); } catch (\Throwable $e) { $row = null; } @@ -4094,7 +4027,7 @@ private function exposedListItem(ExtendDotRun $run, array $item): ?array { * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md */ private function logExtendMiss(string $message, array $context): void { - $this->logger->debug(message: $message, context: ['file' => __FILE__, 'line' => __LINE__] + $context); + $this->runtime->logger->debug(message: $message, context: ['file' => __FILE__, 'line' => __LINE__] + $context); }//end logExtendMiss() /** @@ -4442,13 +4375,13 @@ private function preloadExtendTargets(ObjectEntity $entity, array $uuids): void return; } - $preloadedObjects = $this->objectCacheService->preloadObjects( + $preloadedObjects = $this->stores->mappers->objectCacheService->preloadObjects( identifiers: $uuids, registerId: $this->registerIdOf(entity: $entity) ); $this->cacheExtendTargets(objects: $preloadedObjects); - $this->logger->debug( + $this->runtime->logger->debug( message: '[RenderObject] Batch preloaded objects for extend', context: [ 'file' => __FILE__, @@ -4519,7 +4452,7 @@ private function sharedRegisterIdOf(array $entities): ?int { * @spec openspec/specs/dbal-virtual-registers/spec.md */ private function extendObjectSourceRefs(SourceRefRun $run): void { - if ($this->objectSourceRegistry === null || $run->extend === []) { + if ($this->runtime->extensions->objectSourceRegistry === null || $run->extend === []) { return; } @@ -4574,7 +4507,7 @@ private function sourceRefTarget(SourceRefRun $run, array $definition): bool { return false; } - $run->provider = $this->objectSourceRegistry->get((string)$objectSource['provider']); + $run->provider = $this->runtime->extensions->objectSourceRegistry->get((string)$objectSource['provider']); if ($run->provider?->isEnabled() !== true) { return false; } @@ -4762,8 +4695,8 @@ private function inverseSupport(): InverseRenderSupport { } $this->inverseSupport = new InverseRenderSupport( - mapper: $this->objectEntityMapper, - logger: $this->logger, + mapper: $this->stores->mappers->objectEntityMapper, + logger: $this->runtime->logger, schemas: new InverseSchemaLookups( find: fn (int|string $id): ?Schema => $this->getSchema(id: $id), resolveId: fn (string $ref): string => $this->resolveSchemaReference(schemaRef: $ref) @@ -4856,7 +4789,7 @@ private function schemaIdByUuid(string $reference): ?string { } try { - return (string)$this->schemaMapper->find($reference)->getId(); + return (string)$this->stores->mappers->schemaMapper->find($reference)->getId(); } catch (\Exception $e) { return null; } @@ -4883,7 +4816,7 @@ private function schemaIdByPath(string $reference): ?string { $lastSegment = strtolower(preg_replace('/#.*$/', '', $lastSegment)); try { - $schemas = $this->schemaMapper->findAll(_rbac: false, _multitenancy: false); + $schemas = $this->stores->mappers->schemaMapper->findAll(_rbac: false, _multitenancy: false); } catch (\Exception $e) { return null; } @@ -4908,7 +4841,7 @@ private function schemaIdByPath(string $reference): ?string { * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md */ private function schemaIdBySlug(string $slug): ?string { - $schemas = $this->schemaMapper->findAll(filters: ['slug' => $slug], _rbac: false, _multitenancy: false); + $schemas = $this->stores->mappers->schemaMapper->findAll(filters: ['slug' => $slug], _rbac: false, _multitenancy: false); if (count($schemas) === 1) { return (string)array_shift($schemas)->getId(); } @@ -4978,7 +4911,7 @@ public function renderEntities( $page->multitenancy = $_multitenancy; // Debug level: this fires on EVERY extended list render (hot path). - $this->logger->debug( + $this->runtime->logger->debug( message: '[RenderObject] [BATCH_PRELOAD] Starting batch preload check', context: [ 'file' => __FILE__, @@ -5045,7 +4978,7 @@ private function preloadExtendedRelations(array $entities, array $extend): void } $allUuidsToPreload = array_unique($allUuidsToPreload); - $this->logger->debug( + $this->runtime->logger->debug( message: '[RenderObject] [BATCH_PRELOAD] UUIDs collected', context: [ 'file' => __FILE__, @@ -5075,13 +5008,13 @@ private function preloadExtendedRelations(array $entities, array $extend): void * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md */ private function cachePreloadedObjects(array $entities, array $uuids): void { - $preloadedObjects = $this->objectCacheService->preloadObjects( + $preloadedObjects = $this->stores->mappers->objectCacheService->preloadObjects( identifiers: $uuids, registerId: $this->sharedRegisterIdOf(entities: $entities) ); $this->cacheExtendTargets(objects: $preloadedObjects); - $this->logger->debug( + $this->runtime->logger->debug( message: '[RenderObject] Batch preloaded objects for renderEntities', context: [ 'file' => __FILE__, @@ -5114,7 +5047,7 @@ private function prefetchPageFileIds(array $entities, array $extend): void { $uuids = self::pageUuids(entities: $entities); if (empty($uuids) === false) { - $this->batchFileIdsCache = $this->readableFileIds(idsByUuid: $this->fileMapper->getFileIdsForObjects($uuids)); + $this->batchFileIdsCache = $this->readableFileIds(idsByUuid: $this->stores->files->fileMapper->getFileIdsForObjects($uuids)); } }//end prefetchPageFileIds() @@ -5210,7 +5143,7 @@ private function batchPreloadFileObjects(array $entities): void { } catch (Exception $e) { // A prefetch failure must never break rendering: per-row paths will simply // fall back to individual lookups (the pre-PERF-1 behaviour). - $this->logger->warning( + $this->runtime->logger->warning( message: '[RenderObject] Batch file prefetch failed; falling back to per-row lookups', context: ['file' => __FILE__, 'line' => __LINE__, 'error' => $e->getMessage()] ); @@ -5243,7 +5176,7 @@ private function pageFileIds(array $entities): array { * @return void */ private function preloadFiles(array $fileIds): void { - $filesById = $this->fileMapper->getFilesByIds(fileIds: $fileIds); + $filesById = $this->stores->files->fileMapper->getFilesByIds(fileIds: $fileIds); $this->cacheFileTags(fileIds: $fileIds); // Null for a missing file. @@ -5354,7 +5287,7 @@ private function visibleTagNames(array $tagIdsPerFile): array { } $tagNameMap = []; - foreach ($this->systemTagManager->getTagsByIds(tagIds: $uniqueTagIds) as $tag) { + foreach ($this->stores->files->systemTagManager->getTagsByIds(tagIds: $uniqueTagIds) as $tag) { $name = $tag->getName(); if (str_starts_with($name, 'object:') === false) { $tagNameMap[$tag->getId()] = $name; diff --git a/lib/Service/Object/RenderReadExtensions.php b/lib/Service/Object/RenderReadExtensions.php new file mode 100644 index 000000000000..8ffb8c7c5448 --- /dev/null +++ b/lib/Service/Object/RenderReadExtensions.php @@ -0,0 +1,53 @@ + + * @copyright 2026 Conduction B.V. + * @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 + * + * @version GIT: + * + * @link https://www.OpenRegister.nl + */ + +declare(strict_types=1); + +namespace OCA\OpenRegister\Service\Object; + +use OCA\OpenRegister\Service\FieldEncryptionHandler; +use OCA\OpenRegister\Service\Hinge\LensResolver; +use OCA\OpenRegister\Service\ObjectSource\ObjectSourceRegistry; + +/** + * The optional read-time extensions of a render: object sources, field encryption and lenses. + * + * Each is nullable with a default, as on the renderer before: a null one leaves + * the data exactly as it was. + * + * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md + */ +final class RenderReadExtensions { + /** + * Bundle the services. + * + * @param ObjectSourceRegistry|null $objectSourceRegistry Resolves object-source providers for `$ref` extends into virtual schemas. + * @param FieldEncryptionHandler|null $fieldEncryptionHandler Field-level encryption handler (x-openregister-encrypted). + * @param LensResolver|null $lensResolver Resolves a schema's declared lenses at read time. + * + * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md + */ + public function __construct( + public readonly ?ObjectSourceRegistry $objectSourceRegistry = null, + public readonly ?FieldEncryptionHandler $fieldEncryptionHandler = null, + public readonly ?LensResolver $lensResolver = null, + ) { + }//end __construct() +}//end class diff --git a/lib/Service/Object/RenderRuntime.php b/lib/Service/Object/RenderRuntime.php new file mode 100644 index 000000000000..8fa95cd30ef3 --- /dev/null +++ b/lib/Service/Object/RenderRuntime.php @@ -0,0 +1,55 @@ + + * @copyright 2026 Conduction B.V. + * @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 + * + * @version GIT: + * + * @link https://www.OpenRegister.nl + */ + +declare(strict_types=1); + +namespace OCA\OpenRegister\Service\Object; + +use OCP\IRequest; +use Psr\Container\ContainerInterface; +use Psr\Log\LoggerInterface; + +/** + * The runtime a render works in: the logger, the request, the lazy container and the read extensions. + * + * The container lazily resolves services that would make a construction cycle + * (ObjectService -> RenderObject -> RegistrySubscriptionService -> ObjectService). + * + * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md + */ +final class RenderRuntime { + /** + * Bundle the services. + * + * @param LoggerInterface $logger The logger. + * @param RenderReadExtensions $extensions The optional read-time extensions. + * @param IRequest|null $request The current request, read for `?recurrenceOccurrences=N`. + * @param ContainerInterface|null $container Lazily resolves cycle-prone services. + * + * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md + */ + public function __construct( + public readonly LoggerInterface $logger, + public readonly RenderReadExtensions $extensions, + public readonly ?IRequest $request = null, + public readonly ?ContainerInterface $container = null, + ) { + }//end __construct() +}//end class diff --git a/lib/Service/Object/RenderStores.php b/lib/Service/Object/RenderStores.php new file mode 100644 index 000000000000..1624321040e6 --- /dev/null +++ b/lib/Service/Object/RenderStores.php @@ -0,0 +1,44 @@ + + * @copyright 2026 Conduction B.V. + * @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 + * + * @version GIT: + * + * @link https://www.OpenRegister.nl + */ + +declare(strict_types=1); + +namespace OCA\OpenRegister\Service\Object; + +/** + * Everything a render reads stored data from. + * + * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md + */ +final class RenderStores { + /** + * Bundle the services. + * + * @param RenderMappers $mappers The register, schema and object stores. + * @param RenderFileSources $files The file and tag sources. + * + * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md + */ + public function __construct( + public readonly RenderMappers $mappers, + public readonly RenderFileSources $files, + ) { + }//end __construct() +}//end class diff --git a/lib/Service/Object/RenderTranslations.php b/lib/Service/Object/RenderTranslations.php new file mode 100644 index 000000000000..348586a5b5a0 --- /dev/null +++ b/lib/Service/Object/RenderTranslations.php @@ -0,0 +1,52 @@ + + * @copyright 2026 Conduction B.V. + * @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 + * + * @version GIT: + * + * @link https://www.OpenRegister.nl + */ + +declare(strict_types=1); + +namespace OCA\OpenRegister\Service\Object; + +use OCA\OpenRegister\Db\TranslationMapperInterface; +use OCA\OpenRegister\Service\LanguageService; +use OCA\OpenRegister\Service\TranslationStatusService; + +/** + * What a render resolves translatable properties and languages with. + * + * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md + */ +final class RenderTranslations { + /** + * Bundle the services. + * + * @param TranslationHandler $translationHandler Resolves translatable properties. + * @param TranslationStatusService $translationStatusService Per-object translation status. + * @param TranslationMapperInterface $translationMapper The translation store. + * @param LanguageService $languageService Source-language resolution. + * + * @spec openspec/archive/retrofit-object-lifecycle-2026-04-28/tasks.md + */ + public function __construct( + public readonly TranslationHandler $translationHandler, + public readonly TranslationStatusService $translationStatusService, + public readonly TranslationMapperInterface $translationMapper, + public readonly LanguageService $languageService, + ) { + }//end __construct() +}//end class diff --git a/tests/Unit/Controller/ObjectsControllerWriteOnlyListLeakTest.php b/tests/Unit/Controller/ObjectsControllerWriteOnlyListLeakTest.php index 303b686f5276..3a0bf31fc349 100644 --- a/tests/Unit/Controller/ObjectsControllerWriteOnlyListLeakTest.php +++ b/tests/Unit/Controller/ObjectsControllerWriteOnlyListLeakTest.php @@ -241,24 +241,39 @@ private function realRenderObject(): RenderObject { ); return new RenderObject( - $this->createMock(\OCA\OpenRegister\Files\Db\FileMapper::class), - $this->createMock(MagicMapper::class), - $this->createMock(RegisterMapper::class), - $schemaMapper, - $this->createMock(\OCP\SystemTag\ISystemTagManager::class), - $this->createMock(\OCP\SystemTag\ISystemTagObjectMapper::class), - $this->createMock(\OCA\OpenRegister\Service\Object\CacheHandler::class), - $propertyRbacHandler, - $this->createMock(LoggerInterface::class), - $this->createMock(\OCA\OpenRegister\Service\FileService::class), - $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), - new \OCA\OpenRegister\Service\Object\TranslationHandler($languageService, $this->createMock(LoggerInterface::class)), - $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), - $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), - $this->createMock(\OCA\OpenRegister\Service\UrnService::class), - $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), - $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), - $languageService + stores: new \OCA\OpenRegister\Service\Object\RenderStores( + mappers: new \OCA\OpenRegister\Service\Object\RenderMappers( + objectEntityMapper: $this->createMock(MagicMapper::class), + registerMapper: $this->createMock(RegisterMapper::class), + schemaMapper: $schemaMapper, + objectCacheService: $this->createMock(\OCA\OpenRegister\Service\Object\CacheHandler::class) + ), + files: new \OCA\OpenRegister\Service\Object\RenderFileSources( + fileMapper: $this->createMock(\OCA\OpenRegister\Files\Db\FileMapper::class), + fileService: $this->createMock(\OCA\OpenRegister\Service\FileService::class), + systemTagManager: $this->createMock(\OCP\SystemTag\ISystemTagManager::class), + systemTagMapper: $this->createMock(\OCP\SystemTag\ISystemTagObjectMapper::class) + ) + ), + enrichers: new \OCA\OpenRegister\Service\Object\RenderEnrichers( + translations: new \OCA\OpenRegister\Service\Object\RenderTranslations( + translationHandler: new \OCA\OpenRegister\Service\Object\TranslationHandler($languageService, $this->createMock(LoggerInterface::class)), + translationStatusService: $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), + translationMapper: $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), + languageService: $languageService + ), + derivations: new \OCA\OpenRegister\Service\Object\RenderDerivations( + computedFieldHandler: $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), + calculationEvaluator: $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), + linkedEntityEnricher: $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), + urnService: $this->createMock(\OCA\OpenRegister\Service\UrnService::class) + ) + ), + runtime: new \OCA\OpenRegister\Service\Object\RenderRuntime( + logger: $this->createMock(LoggerInterface::class), + extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions() + ), + propertyRbacHandler: $propertyRbacHandler ); } diff --git a/tests/Unit/Service/File/FileRestrictionRenderAndLinkTest.php b/tests/Unit/Service/File/FileRestrictionRenderAndLinkTest.php index 5e2c3000ebe4..9e178aaa8235 100644 --- a/tests/Unit/Service/File/FileRestrictionRenderAndLinkTest.php +++ b/tests/Unit/Service/File/FileRestrictionRenderAndLinkTest.php @@ -104,25 +104,40 @@ private function renderer(?FileService $fileService = null): RenderObject { $container->method('get')->willReturnCallback(static fn (string $id): object => $guard); return new RenderObject( - fileMapper: $fileMapper, - objectEntityMapper: $this->createMock(MagicMapper::class), - registerMapper: $this->createMock(RegisterMapper::class), - schemaMapper: $this->createMock(SchemaMapper::class), - systemTagManager: $this->createMock(ISystemTagManager::class), - systemTagMapper: $this->createMock(ISystemTagObjectMapper::class), - objectCacheService: $this->createMock(CacheHandler::class), - propertyRbacHandler: $this->createMock(PropertyRbacHandler::class), - logger: new NullLogger(), - fileService: $fileService ?? $this->createMock(FileService::class), - computedFieldHandler: $this->createMock(ComputedFieldHandler::class), - translationHandler: $this->createMock(TranslationHandler::class), - linkedEntityEnricher: $this->createMock(LinkedEntityEnricher::class), - calculationEvaluator: $this->createMock(CalculationEvaluator::class), - urnService: $this->createMock(UrnService::class), - translationStatusService: $this->createMock(TranslationStatusService::class), - translationMapper: $this->createMock(TranslationMapper::class), - languageService: $this->createMock(LanguageService::class), - container: $container, + stores: new \OCA\OpenRegister\Service\Object\RenderStores( + mappers: new \OCA\OpenRegister\Service\Object\RenderMappers( + objectEntityMapper: $this->createMock(MagicMapper::class), + registerMapper: $this->createMock(RegisterMapper::class), + schemaMapper: $this->createMock(SchemaMapper::class), + objectCacheService: $this->createMock(CacheHandler::class) + ), + files: new \OCA\OpenRegister\Service\Object\RenderFileSources( + fileMapper: $fileMapper, + fileService: $fileService ?? $this->createMock(FileService::class), + systemTagManager: $this->createMock(ISystemTagManager::class), + systemTagMapper: $this->createMock(ISystemTagObjectMapper::class) + ) + ), + enrichers: new \OCA\OpenRegister\Service\Object\RenderEnrichers( + translations: new \OCA\OpenRegister\Service\Object\RenderTranslations( + translationHandler: $this->createMock(TranslationHandler::class), + translationStatusService: $this->createMock(TranslationStatusService::class), + translationMapper: $this->createMock(TranslationMapper::class), + languageService: $this->createMock(LanguageService::class) + ), + derivations: new \OCA\OpenRegister\Service\Object\RenderDerivations( + computedFieldHandler: $this->createMock(ComputedFieldHandler::class), + calculationEvaluator: $this->createMock(CalculationEvaluator::class), + linkedEntityEnricher: $this->createMock(LinkedEntityEnricher::class), + urnService: $this->createMock(UrnService::class) + ) + ), + runtime: new \OCA\OpenRegister\Service\Object\RenderRuntime( + logger: new NullLogger(), + extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions(), + container: $container + ), + propertyRbacHandler: $this->createMock(PropertyRbacHandler::class) ); }//end renderer() diff --git a/tests/Unit/Service/Object/RenderObjectCoverageTest.php b/tests/Unit/Service/Object/RenderObjectCoverageTest.php index 3f73d006aab1..6ad9cd06f31c 100644 --- a/tests/Unit/Service/Object/RenderObjectCoverageTest.php +++ b/tests/Unit/Service/Object/RenderObjectCoverageTest.php @@ -111,24 +111,39 @@ protected function setUp(): void { }); $this->handler = new RenderObject( - $this->fileMapper, - $this->objectMapper, - $this->registerMapper, - $this->schemaMapper, - $this->systemTagManager, - $this->systemTagMapper, - $this->objectCacheService, - $this->propertyRbacHandler, - $this->logger, - $this->fileService, - $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), - $translationHandler, - $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), - $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), - $this->createMock(\OCA\OpenRegister\Service\UrnService::class), - $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), - $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), - $this->createMock(\OCA\OpenRegister\Service\LanguageService::class) + stores: new \OCA\OpenRegister\Service\Object\RenderStores( + mappers: new \OCA\OpenRegister\Service\Object\RenderMappers( + objectEntityMapper: $this->objectMapper, + registerMapper: $this->registerMapper, + schemaMapper: $this->schemaMapper, + objectCacheService: $this->objectCacheService + ), + files: new \OCA\OpenRegister\Service\Object\RenderFileSources( + fileMapper: $this->fileMapper, + fileService: $this->fileService, + systemTagManager: $this->systemTagManager, + systemTagMapper: $this->systemTagMapper + ) + ), + enrichers: new \OCA\OpenRegister\Service\Object\RenderEnrichers( + translations: new \OCA\OpenRegister\Service\Object\RenderTranslations( + translationHandler: $translationHandler, + translationStatusService: $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), + translationMapper: $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), + languageService: $this->createMock(\OCA\OpenRegister\Service\LanguageService::class) + ), + derivations: new \OCA\OpenRegister\Service\Object\RenderDerivations( + computedFieldHandler: $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), + calculationEvaluator: $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), + linkedEntityEnricher: $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), + urnService: $this->createMock(\OCA\OpenRegister\Service\UrnService::class) + ) + ), + runtime: new \OCA\OpenRegister\Service\Object\RenderRuntime( + logger: $this->logger, + extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions() + ), + propertyRbacHandler: $this->propertyRbacHandler ); } diff --git a/tests/Unit/Service/Object/RenderObjectDeepTest.php b/tests/Unit/Service/Object/RenderObjectDeepTest.php index 937337ed60c9..ba9a28870a5e 100644 --- a/tests/Unit/Service/Object/RenderObjectDeepTest.php +++ b/tests/Unit/Service/Object/RenderObjectDeepTest.php @@ -101,24 +101,39 @@ protected function setUp(): void { $this->fileService = $this->createMock(FileService::class); $this->handler = new RenderObject( - $this->fileMapper, - $this->objectMapper, - $this->registerMapper, - $this->schemaMapper, - $this->systemTagManager, - $this->systemTagMapper, - $this->objectCacheService, - $this->propertyRbacHandler, - $this->logger, - $this->fileService, - $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), - $this->createMock(\OCA\OpenRegister\Service\Object\TranslationHandler::class), - $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), - $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), - $this->createMock(\OCA\OpenRegister\Service\UrnService::class), - $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), - $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), - $this->createMock(\OCA\OpenRegister\Service\LanguageService::class) + stores: new \OCA\OpenRegister\Service\Object\RenderStores( + mappers: new \OCA\OpenRegister\Service\Object\RenderMappers( + objectEntityMapper: $this->objectMapper, + registerMapper: $this->registerMapper, + schemaMapper: $this->schemaMapper, + objectCacheService: $this->objectCacheService + ), + files: new \OCA\OpenRegister\Service\Object\RenderFileSources( + fileMapper: $this->fileMapper, + fileService: $this->fileService, + systemTagManager: $this->systemTagManager, + systemTagMapper: $this->systemTagMapper + ) + ), + enrichers: new \OCA\OpenRegister\Service\Object\RenderEnrichers( + translations: new \OCA\OpenRegister\Service\Object\RenderTranslations( + translationHandler: $this->createMock(\OCA\OpenRegister\Service\Object\TranslationHandler::class), + translationStatusService: $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), + translationMapper: $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), + languageService: $this->createMock(\OCA\OpenRegister\Service\LanguageService::class) + ), + derivations: new \OCA\OpenRegister\Service\Object\RenderDerivations( + computedFieldHandler: $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), + calculationEvaluator: $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), + linkedEntityEnricher: $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), + urnService: $this->createMock(\OCA\OpenRegister\Service\UrnService::class) + ) + ), + runtime: new \OCA\OpenRegister\Service\Object\RenderRuntime( + logger: $this->logger, + extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions() + ), + propertyRbacHandler: $this->propertyRbacHandler ); } diff --git a/tests/Unit/Service/Object/RenderObjectExtendReadCheckTest.php b/tests/Unit/Service/Object/RenderObjectExtendReadCheckTest.php index 111ee6a98ca3..3e213ba19ed7 100644 --- a/tests/Unit/Service/Object/RenderObjectExtendReadCheckTest.php +++ b/tests/Unit/Service/Object/RenderObjectExtendReadCheckTest.php @@ -199,10 +199,42 @@ function (string $id): object { 'container' => $container, ]; - // Only what the constructor declares, so the test follows its dependency list. - $declared = array_column((new \ReflectionMethod(RenderObject::class, '__construct'))->getParameters(), 'name'); - - return new RenderObject(...array_intersect_key($dependencies, array_flip($declared))); +return new RenderObject( + stores: new \OCA\OpenRegister\Service\Object\RenderStores( + mappers: new \OCA\OpenRegister\Service\Object\RenderMappers( + objectEntityMapper: $dependencies['objectEntityMapper'], + registerMapper: $dependencies['registerMapper'], + schemaMapper: $dependencies['schemaMapper'], + objectCacheService: $dependencies['objectCacheService'] + ), + files: new \OCA\OpenRegister\Service\Object\RenderFileSources( + fileMapper: $dependencies['fileMapper'], + fileService: $dependencies['fileService'], + systemTagManager: $dependencies['systemTagManager'], + systemTagMapper: $dependencies['systemTagMapper'] + ) + ), + enrichers: new \OCA\OpenRegister\Service\Object\RenderEnrichers( + translations: new \OCA\OpenRegister\Service\Object\RenderTranslations( + translationHandler: $dependencies['translationHandler'], + translationStatusService: $dependencies['translationStatusService'], + translationMapper: $dependencies['translationMapper'], + languageService: $dependencies['languageService'] + ), + derivations: new \OCA\OpenRegister\Service\Object\RenderDerivations( + computedFieldHandler: $dependencies['computedFieldHandler'], + calculationEvaluator: $dependencies['calculationEvaluator'], + linkedEntityEnricher: $dependencies['linkedEntityEnricher'], + urnService: $dependencies['urnService'] + ) + ), + runtime: new \OCA\OpenRegister\Service\Object\RenderRuntime( + logger: $dependencies['logger'], + extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions(), + container: $dependencies['container'] + ), + propertyRbacHandler: $dependencies['propertyRbacHandler'] + ); } /** diff --git a/tests/Unit/Service/Object/RenderObjectFieldEncryptionTest.php b/tests/Unit/Service/Object/RenderObjectFieldEncryptionTest.php index 69e5fbe8637b..f04c7b972cdd 100644 --- a/tests/Unit/Service/Object/RenderObjectFieldEncryptionTest.php +++ b/tests/Unit/Service/Object/RenderObjectFieldEncryptionTest.php @@ -99,27 +99,40 @@ function (string $cipher): string { $this->fieldEncryptionHandler = new FieldEncryptionHandler($this->crypto, $logger); $this->handler = new RenderObject( - $this->fileMapper, - $this->objectMapper, - $this->registerMapper, - $this->schemaMapper, - $this->createMock(ISystemTagManager::class), - $this->createMock(ISystemTagObjectMapper::class), - $this->createMock(CacheHandler::class), - $this->propertyRbacHandler, - $logger, - $this->createMock(FileService::class), - $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), - $translationHandler, - $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), - $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), - $this->createMock(\OCA\OpenRegister\Service\UrnService::class), - $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), - $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), - $this->createMock(\OCA\OpenRegister\Service\LanguageService::class), - request: null, - objectSourceRegistry: null, - fieldEncryptionHandler: $this->fieldEncryptionHandler, + stores: new \OCA\OpenRegister\Service\Object\RenderStores( + mappers: new \OCA\OpenRegister\Service\Object\RenderMappers( + objectEntityMapper: $this->objectMapper, + registerMapper: $this->registerMapper, + schemaMapper: $this->schemaMapper, + objectCacheService: $this->createMock(CacheHandler::class) + ), + files: new \OCA\OpenRegister\Service\Object\RenderFileSources( + fileMapper: $this->fileMapper, + fileService: $this->createMock(FileService::class), + systemTagManager: $this->createMock(ISystemTagManager::class), + systemTagMapper: $this->createMock(ISystemTagObjectMapper::class) + ) + ), + enrichers: new \OCA\OpenRegister\Service\Object\RenderEnrichers( + translations: new \OCA\OpenRegister\Service\Object\RenderTranslations( + translationHandler: $translationHandler, + translationStatusService: $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), + translationMapper: $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), + languageService: $this->createMock(\OCA\OpenRegister\Service\LanguageService::class) + ), + derivations: new \OCA\OpenRegister\Service\Object\RenderDerivations( + computedFieldHandler: $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), + calculationEvaluator: $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), + linkedEntityEnricher: $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), + urnService: $this->createMock(\OCA\OpenRegister\Service\UrnService::class) + ) + ), + runtime: new \OCA\OpenRegister\Service\Object\RenderRuntime( + logger: $logger, + extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions(objectSourceRegistry: null, fieldEncryptionHandler: $this->fieldEncryptionHandler), + request: null + ), + propertyRbacHandler: $this->propertyRbacHandler ); } diff --git a/tests/Unit/Service/Object/RenderObjectInverseReadCheckTest.php b/tests/Unit/Service/Object/RenderObjectInverseReadCheckTest.php index 122e0ad54276..1f91757be374 100644 --- a/tests/Unit/Service/Object/RenderObjectInverseReadCheckTest.php +++ b/tests/Unit/Service/Object/RenderObjectInverseReadCheckTest.php @@ -169,25 +169,40 @@ function (string $id): object { $translations->method('resolveTranslationsForRender')->willReturnArgument(0); return new RenderObject( - fileMapper: $this->createMock(FileMapper::class), - objectEntityMapper: $this->mapper, - registerMapper: $this->createMock(RegisterMapper::class), - schemaMapper: $schemas, - systemTagManager: $this->createMock(ISystemTagManager::class), - systemTagMapper: $this->createMock(ISystemTagObjectMapper::class), - objectCacheService: $this->createMock(CacheHandler::class), - propertyRbacHandler: $this->createMock(PropertyRbacHandler::class), - logger: new NullLogger(), - fileService: $this->createMock(FileService::class), - computedFieldHandler: $this->createMock(ComputedFieldHandler::class), - translationHandler: $translations, - linkedEntityEnricher: $this->createMock(LinkedEntityEnricher::class), - calculationEvaluator: $this->createMock(CalculationEvaluator::class), - urnService: $this->createMock(UrnService::class), - translationStatusService: $this->createMock(TranslationStatusService::class), - translationMapper: $this->createMock(TranslationMapper::class), - languageService: $this->createMock(LanguageService::class), - container: $container, + stores: new \OCA\OpenRegister\Service\Object\RenderStores( + mappers: new \OCA\OpenRegister\Service\Object\RenderMappers( + objectEntityMapper: $this->mapper, + registerMapper: $this->createMock(RegisterMapper::class), + schemaMapper: $schemas, + objectCacheService: $this->createMock(CacheHandler::class) + ), + files: new \OCA\OpenRegister\Service\Object\RenderFileSources( + fileMapper: $this->createMock(FileMapper::class), + fileService: $this->createMock(FileService::class), + systemTagManager: $this->createMock(ISystemTagManager::class), + systemTagMapper: $this->createMock(ISystemTagObjectMapper::class) + ) + ), + enrichers: new \OCA\OpenRegister\Service\Object\RenderEnrichers( + translations: new \OCA\OpenRegister\Service\Object\RenderTranslations( + translationHandler: $translations, + translationStatusService: $this->createMock(TranslationStatusService::class), + translationMapper: $this->createMock(TranslationMapper::class), + languageService: $this->createMock(LanguageService::class) + ), + derivations: new \OCA\OpenRegister\Service\Object\RenderDerivations( + computedFieldHandler: $this->createMock(ComputedFieldHandler::class), + calculationEvaluator: $this->createMock(CalculationEvaluator::class), + linkedEntityEnricher: $this->createMock(LinkedEntityEnricher::class), + urnService: $this->createMock(UrnService::class) + ) + ), + runtime: new \OCA\OpenRegister\Service\Object\RenderRuntime( + logger: new NullLogger(), + extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions(), + container: $container + ), + propertyRbacHandler: $this->createMock(PropertyRbacHandler::class) ); } diff --git a/tests/Unit/Service/Object/RenderObjectLanguageMetaGoldenTest.php b/tests/Unit/Service/Object/RenderObjectLanguageMetaGoldenTest.php index 9ccb9cf2661e..a84076959623 100644 --- a/tests/Unit/Service/Object/RenderObjectLanguageMetaGoldenTest.php +++ b/tests/Unit/Service/Object/RenderObjectLanguageMetaGoldenTest.php @@ -95,25 +95,40 @@ protected function setUp(): void { $request->method('getParam')->willReturnMap([['_translationMeta', null, 'true']]); $this->render = new RenderObject( - fileMapper: $this->createMock(FileMapperInterface::class), - objectEntityMapper: $this->createMock(MagicMapperInterface::class), - registerMapper: $this->registers, - schemaMapper: $this->createMock(SchemaMapperInterface::class), - systemTagManager: $this->createMock(ISystemTagManager::class), - systemTagMapper: $this->createMock(ISystemTagObjectMapper::class), - objectCacheService: $this->createMock(CacheHandlerInterface::class), - propertyRbacHandler: $this->createMock(PropertyRbacHandler::class), - logger: $this->logger, - fileService: $this->createMock(FileService::class), - computedFieldHandler: $this->createMock(ComputedFieldHandler::class), - translationHandler: $this->translations, - linkedEntityEnricher: $this->createMock(LinkedEntityEnricher::class), - calculationEvaluator: $this->createMock(CalculationEvaluatorInterface::class), - urnService: $this->createMock(UrnService::class), - translationStatusService: $this->createMock(TranslationStatusService::class), - translationMapper: $this->mapper, - languageService: $languages, - request: $request, + stores: new \OCA\OpenRegister\Service\Object\RenderStores( + mappers: new \OCA\OpenRegister\Service\Object\RenderMappers( + objectEntityMapper: $this->createMock(MagicMapperInterface::class), + registerMapper: $this->registers, + schemaMapper: $this->createMock(SchemaMapperInterface::class), + objectCacheService: $this->createMock(CacheHandlerInterface::class) + ), + files: new \OCA\OpenRegister\Service\Object\RenderFileSources( + fileMapper: $this->createMock(FileMapperInterface::class), + fileService: $this->createMock(FileService::class), + systemTagManager: $this->createMock(ISystemTagManager::class), + systemTagMapper: $this->createMock(ISystemTagObjectMapper::class) + ) + ), + enrichers: new \OCA\OpenRegister\Service\Object\RenderEnrichers( + translations: new \OCA\OpenRegister\Service\Object\RenderTranslations( + translationHandler: $this->translations, + translationStatusService: $this->createMock(TranslationStatusService::class), + translationMapper: $this->mapper, + languageService: $languages + ), + derivations: new \OCA\OpenRegister\Service\Object\RenderDerivations( + computedFieldHandler: $this->createMock(ComputedFieldHandler::class), + calculationEvaluator: $this->createMock(CalculationEvaluatorInterface::class), + linkedEntityEnricher: $this->createMock(LinkedEntityEnricher::class), + urnService: $this->createMock(UrnService::class) + ) + ), + runtime: new \OCA\OpenRegister\Service\Object\RenderRuntime( + logger: $this->logger, + extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions(), + request: $request + ), + propertyRbacHandler: $this->createMock(PropertyRbacHandler::class) ); }//end setUp() diff --git a/tests/Unit/Service/Object/RenderObjectLensRowsTest.php b/tests/Unit/Service/Object/RenderObjectLensRowsTest.php index f97fa464c9e6..201fd43931be 100644 --- a/tests/Unit/Service/Object/RenderObjectLensRowsTest.php +++ b/tests/Unit/Service/Object/RenderObjectLensRowsTest.php @@ -91,25 +91,39 @@ private function renderer(Schema $schema, LensResolver&MockObject $lenses): Rend $schemaMapper->method('find')->willReturn($schema); return new RenderObject( - fileMapper: $this->createMock(originalClassName: \OCA\OpenRegister\Files\Db\FileMapper::class), - objectEntityMapper: $this->createMock(originalClassName: \OCA\OpenRegister\Db\MagicMapper::class), - registerMapper: $this->createMock(originalClassName: \OCA\OpenRegister\Db\RegisterMapper::class), - schemaMapper: $schemaMapper, - systemTagManager: $this->createMock(originalClassName: \OCP\SystemTag\ISystemTagManager::class), - systemTagMapper: $this->createMock(originalClassName: \OCP\SystemTag\ISystemTagObjectMapper::class), - objectCacheService: $this->createMock(originalClassName: \OCA\OpenRegister\Service\Object\CacheHandler::class), - propertyRbacHandler: $this->createMock(originalClassName: \OCA\OpenRegister\Service\PropertyRbacHandler::class), - logger: $this->createMock(originalClassName: \Psr\Log\LoggerInterface::class), - fileService: $this->createMock(originalClassName: \OCA\OpenRegister\Service\FileService::class), - computedFieldHandler: $this->createMock(originalClassName: \OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), - translationHandler: $this->createMock(originalClassName: \OCA\OpenRegister\Service\Object\TranslationHandler::class), - linkedEntityEnricher: $this->createMock(originalClassName: \OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), - calculationEvaluator: $this->createMock(originalClassName: \OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), - urnService: $this->createMock(originalClassName: \OCA\OpenRegister\Service\UrnService::class), - translationStatusService: $this->createMock(originalClassName: \OCA\OpenRegister\Service\TranslationStatusService::class), - translationMapper: $this->createMock(originalClassName: \OCA\OpenRegister\Db\TranslationMapper::class), - languageService: $this->createMock(originalClassName: \OCA\OpenRegister\Service\LanguageService::class), - lensResolver: $lenses, + stores: new \OCA\OpenRegister\Service\Object\RenderStores( + mappers: new \OCA\OpenRegister\Service\Object\RenderMappers( + objectEntityMapper: $this->createMock(originalClassName: \OCA\OpenRegister\Db\MagicMapper::class), + registerMapper: $this->createMock(originalClassName: \OCA\OpenRegister\Db\RegisterMapper::class), + schemaMapper: $schemaMapper, + objectCacheService: $this->createMock(originalClassName: \OCA\OpenRegister\Service\Object\CacheHandler::class) + ), + files: new \OCA\OpenRegister\Service\Object\RenderFileSources( + fileMapper: $this->createMock(originalClassName: \OCA\OpenRegister\Files\Db\FileMapper::class), + fileService: $this->createMock(originalClassName: \OCA\OpenRegister\Service\FileService::class), + systemTagManager: $this->createMock(originalClassName: \OCP\SystemTag\ISystemTagManager::class), + systemTagMapper: $this->createMock(originalClassName: \OCP\SystemTag\ISystemTagObjectMapper::class) + ) + ), + enrichers: new \OCA\OpenRegister\Service\Object\RenderEnrichers( + translations: new \OCA\OpenRegister\Service\Object\RenderTranslations( + translationHandler: $this->createMock(originalClassName: \OCA\OpenRegister\Service\Object\TranslationHandler::class), + translationStatusService: $this->createMock(originalClassName: \OCA\OpenRegister\Service\TranslationStatusService::class), + translationMapper: $this->createMock(originalClassName: \OCA\OpenRegister\Db\TranslationMapper::class), + languageService: $this->createMock(originalClassName: \OCA\OpenRegister\Service\LanguageService::class) + ), + derivations: new \OCA\OpenRegister\Service\Object\RenderDerivations( + computedFieldHandler: $this->createMock(originalClassName: \OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), + calculationEvaluator: $this->createMock(originalClassName: \OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), + linkedEntityEnricher: $this->createMock(originalClassName: \OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), + urnService: $this->createMock(originalClassName: \OCA\OpenRegister\Service\UrnService::class) + ) + ), + runtime: new \OCA\OpenRegister\Service\Object\RenderRuntime( + logger: $this->createMock(originalClassName: \Psr\Log\LoggerInterface::class), + extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions(lensResolver: $lenses) + ), + propertyRbacHandler: $this->createMock(originalClassName: \OCA\OpenRegister\Service\PropertyRbacHandler::class) ); }//end renderer() diff --git a/tests/Unit/Service/Object/RenderObjectNestedWriteOnlyPathsTest.php b/tests/Unit/Service/Object/RenderObjectNestedWriteOnlyPathsTest.php index 47ad78e58744..8c8eb2889bae 100644 --- a/tests/Unit/Service/Object/RenderObjectNestedWriteOnlyPathsTest.php +++ b/tests/Unit/Service/Object/RenderObjectNestedWriteOnlyPathsTest.php @@ -186,24 +186,39 @@ private function renderer(Schema $schema): RenderObject { ); return new RenderObject( - $this->createMock(\OCA\OpenRegister\Files\Db\FileMapper::class), - $this->createMock(\OCA\OpenRegister\Db\MagicMapper::class), - $this->createMock(\OCA\OpenRegister\Db\RegisterMapper::class), - $schemaMapper, - $this->createMock(\OCP\SystemTag\ISystemTagManager::class), - $this->createMock(\OCP\SystemTag\ISystemTagObjectMapper::class), - $this->createMock(\OCA\OpenRegister\Service\Object\CacheHandler::class), - $rbac, - $this->createMock(\Psr\Log\LoggerInterface::class), - $this->createMock(\OCA\OpenRegister\Service\FileService::class), - $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), - $translation, - $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), - $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), - $this->createMock(\OCA\OpenRegister\Service\UrnService::class), - $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), - $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), - $this->createMock(\OCA\OpenRegister\Service\LanguageService::class) + stores: new \OCA\OpenRegister\Service\Object\RenderStores( + mappers: new \OCA\OpenRegister\Service\Object\RenderMappers( + objectEntityMapper: $this->createMock(\OCA\OpenRegister\Db\MagicMapper::class), + registerMapper: $this->createMock(\OCA\OpenRegister\Db\RegisterMapper::class), + schemaMapper: $schemaMapper, + objectCacheService: $this->createMock(\OCA\OpenRegister\Service\Object\CacheHandler::class) + ), + files: new \OCA\OpenRegister\Service\Object\RenderFileSources( + fileMapper: $this->createMock(\OCA\OpenRegister\Files\Db\FileMapper::class), + fileService: $this->createMock(\OCA\OpenRegister\Service\FileService::class), + systemTagManager: $this->createMock(\OCP\SystemTag\ISystemTagManager::class), + systemTagMapper: $this->createMock(\OCP\SystemTag\ISystemTagObjectMapper::class) + ) + ), + enrichers: new \OCA\OpenRegister\Service\Object\RenderEnrichers( + translations: new \OCA\OpenRegister\Service\Object\RenderTranslations( + translationHandler: $translation, + translationStatusService: $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), + translationMapper: $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), + languageService: $this->createMock(\OCA\OpenRegister\Service\LanguageService::class) + ), + derivations: new \OCA\OpenRegister\Service\Object\RenderDerivations( + computedFieldHandler: $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), + calculationEvaluator: $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), + linkedEntityEnricher: $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), + urnService: $this->createMock(\OCA\OpenRegister\Service\UrnService::class) + ) + ), + runtime: new \OCA\OpenRegister\Service\Object\RenderRuntime( + logger: $this->createMock(\Psr\Log\LoggerInterface::class), + extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions() + ), + propertyRbacHandler: $rbac ); } diff --git a/tests/Unit/Service/Object/RenderObjectPropertyReadCopiesTest.php b/tests/Unit/Service/Object/RenderObjectPropertyReadCopiesTest.php index 6927dd462372..697eab7e426a 100644 --- a/tests/Unit/Service/Object/RenderObjectPropertyReadCopiesTest.php +++ b/tests/Unit/Service/Object/RenderObjectPropertyReadCopiesTest.php @@ -80,24 +80,39 @@ private function renderer(Schema $schema, ?\OCA\OpenRegister\Service\PropertyRba $schemaMapper->method('find')->willReturn($schema); return new RenderObject( - $this->createMock(\OCA\OpenRegister\Files\Db\FileMapper::class), - $this->createMock(\OCA\OpenRegister\Db\MagicMapper::class), - $this->createMock(\OCA\OpenRegister\Db\RegisterMapper::class), - $schemaMapper, - $this->createMock(\OCP\SystemTag\ISystemTagManager::class), - $this->createMock(\OCP\SystemTag\ISystemTagObjectMapper::class), - $this->createMock(\OCA\OpenRegister\Service\Object\CacheHandler::class), - ($rbac ?? $this->realPropertyRbacHandler()), - $this->createMock(\Psr\Log\LoggerInterface::class), - $this->createMock(\OCA\OpenRegister\Service\FileService::class), - $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), - $this->translationPassthrough(), - $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), - $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), - $this->createMock(\OCA\OpenRegister\Service\UrnService::class), - $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), - $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), - $this->createMock(\OCA\OpenRegister\Service\LanguageService::class) + stores: new \OCA\OpenRegister\Service\Object\RenderStores( + mappers: new \OCA\OpenRegister\Service\Object\RenderMappers( + objectEntityMapper: $this->createMock(\OCA\OpenRegister\Db\MagicMapper::class), + registerMapper: $this->createMock(\OCA\OpenRegister\Db\RegisterMapper::class), + schemaMapper: $schemaMapper, + objectCacheService: $this->createMock(\OCA\OpenRegister\Service\Object\CacheHandler::class) + ), + files: new \OCA\OpenRegister\Service\Object\RenderFileSources( + fileMapper: $this->createMock(\OCA\OpenRegister\Files\Db\FileMapper::class), + fileService: $this->createMock(\OCA\OpenRegister\Service\FileService::class), + systemTagManager: $this->createMock(\OCP\SystemTag\ISystemTagManager::class), + systemTagMapper: $this->createMock(\OCP\SystemTag\ISystemTagObjectMapper::class) + ) + ), + enrichers: new \OCA\OpenRegister\Service\Object\RenderEnrichers( + translations: new \OCA\OpenRegister\Service\Object\RenderTranslations( + translationHandler: $this->translationPassthrough(), + translationStatusService: $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), + translationMapper: $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), + languageService: $this->createMock(\OCA\OpenRegister\Service\LanguageService::class) + ), + derivations: new \OCA\OpenRegister\Service\Object\RenderDerivations( + computedFieldHandler: $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), + calculationEvaluator: $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), + linkedEntityEnricher: $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), + urnService: $this->createMock(\OCA\OpenRegister\Service\UrnService::class) + ) + ), + runtime: new \OCA\OpenRegister\Service\Object\RenderRuntime( + logger: $this->createMock(\Psr\Log\LoggerInterface::class), + extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions() + ), + propertyRbacHandler: ($rbac ?? $this->realPropertyRbacHandler()) ); } diff --git a/tests/Unit/Service/Object/RenderObjectRenderEntityPhasesTest.php b/tests/Unit/Service/Object/RenderObjectRenderEntityPhasesTest.php index 9a017778d6eb..f42db97964e4 100644 --- a/tests/Unit/Service/Object/RenderObjectRenderEntityPhasesTest.php +++ b/tests/Unit/Service/Object/RenderObjectRenderEntityPhasesTest.php @@ -111,29 +111,41 @@ private function render( ?LensResolver $lens = null ): RenderObject { return new RenderObject( - $this->createMock(FileMapper::class), - $this->createMock(MagicMapper::class), - $this->registers, - $this->schemaMapper, - $this->createMock(ISystemTagManager::class), - $this->createMock(ISystemTagObjectMapper::class), - $this->createMock(CacheHandler::class), - $this->createMock(PropertyRbacHandler::class), - $this->logger, - $this->createMock(FileService::class), - $this->createMock(ComputedFieldHandler::class), - $this->translationHandler, - $this->enricher, - $this->evaluator, - $this->urnService, - $this->translationStatus, - $this->createMock(TranslationMapper::class), - $this->createMock(LanguageService::class), - $request, - null, - null, - $container, - $lens + stores: new \OCA\OpenRegister\Service\Object\RenderStores( + mappers: new \OCA\OpenRegister\Service\Object\RenderMappers( + objectEntityMapper: $this->createMock(MagicMapper::class), + registerMapper: $this->registers, + schemaMapper: $this->schemaMapper, + objectCacheService: $this->createMock(CacheHandler::class) + ), + files: new \OCA\OpenRegister\Service\Object\RenderFileSources( + fileMapper: $this->createMock(FileMapper::class), + fileService: $this->createMock(FileService::class), + systemTagManager: $this->createMock(ISystemTagManager::class), + systemTagMapper: $this->createMock(ISystemTagObjectMapper::class) + ) + ), + enrichers: new \OCA\OpenRegister\Service\Object\RenderEnrichers( + translations: new \OCA\OpenRegister\Service\Object\RenderTranslations( + translationHandler: $this->translationHandler, + translationStatusService: $this->translationStatus, + translationMapper: $this->createMock(TranslationMapper::class), + languageService: $this->createMock(LanguageService::class) + ), + derivations: new \OCA\OpenRegister\Service\Object\RenderDerivations( + computedFieldHandler: $this->createMock(ComputedFieldHandler::class), + calculationEvaluator: $this->evaluator, + linkedEntityEnricher: $this->enricher, + urnService: $this->urnService + ) + ), + runtime: new \OCA\OpenRegister\Service\Object\RenderRuntime( + logger: $this->logger, + extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions(objectSourceRegistry: null, fieldEncryptionHandler: null, lensResolver: $lens), + request: $request, + container: $container + ), + propertyRbacHandler: $this->createMock(PropertyRbacHandler::class) ); }//end render() diff --git a/tests/Unit/Service/Object/RenderObjectTest.php b/tests/Unit/Service/Object/RenderObjectTest.php index 77f71eb4d4c7..7702d5d5c822 100644 --- a/tests/Unit/Service/Object/RenderObjectTest.php +++ b/tests/Unit/Service/Object/RenderObjectTest.php @@ -105,24 +105,39 @@ protected function setUp(): void { }); $this->handler = new RenderObject( - $this->fileMapper, - $this->objectMapper, - $this->registerMapper, - $this->schemaMapper, - $this->systemTagManager, - $this->systemTagMapper, - $this->objectCacheService, - $this->propertyRbacHandler, - $this->logger, - $this->fileService, - $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), - $translationHandler, - $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), - $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), - $this->createMock(\OCA\OpenRegister\Service\UrnService::class), - $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), - $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), - $this->createMock(\OCA\OpenRegister\Service\LanguageService::class) + stores: new \OCA\OpenRegister\Service\Object\RenderStores( + mappers: new \OCA\OpenRegister\Service\Object\RenderMappers( + objectEntityMapper: $this->objectMapper, + registerMapper: $this->registerMapper, + schemaMapper: $this->schemaMapper, + objectCacheService: $this->objectCacheService + ), + files: new \OCA\OpenRegister\Service\Object\RenderFileSources( + fileMapper: $this->fileMapper, + fileService: $this->fileService, + systemTagManager: $this->systemTagManager, + systemTagMapper: $this->systemTagMapper + ) + ), + enrichers: new \OCA\OpenRegister\Service\Object\RenderEnrichers( + translations: new \OCA\OpenRegister\Service\Object\RenderTranslations( + translationHandler: $translationHandler, + translationStatusService: $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), + translationMapper: $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), + languageService: $this->createMock(\OCA\OpenRegister\Service\LanguageService::class) + ), + derivations: new \OCA\OpenRegister\Service\Object\RenderDerivations( + computedFieldHandler: $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), + calculationEvaluator: $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), + linkedEntityEnricher: $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), + urnService: $this->createMock(\OCA\OpenRegister\Service\UrnService::class) + ) + ), + runtime: new \OCA\OpenRegister\Service\Object\RenderRuntime( + logger: $this->logger, + extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions() + ), + propertyRbacHandler: $this->propertyRbacHandler ); } @@ -1589,24 +1604,39 @@ public function testResolveSchemaReferenceByUuidFallsToSlugLookup(): void { ->willReturn([$schema]); $handler = new RenderObject( - $this->fileMapper, - $this->objectMapper, - $this->registerMapper, - $schemaMapper, - $this->systemTagManager, - $this->systemTagMapper, - $this->objectCacheService, - $this->propertyRbacHandler, - $this->logger, - $this->fileService, - $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), - $this->createMock(\OCA\OpenRegister\Service\Object\TranslationHandler::class), - $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), - $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), - $this->createMock(\OCA\OpenRegister\Service\UrnService::class), - $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), - $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), - $this->createMock(\OCA\OpenRegister\Service\LanguageService::class) + stores: new \OCA\OpenRegister\Service\Object\RenderStores( + mappers: new \OCA\OpenRegister\Service\Object\RenderMappers( + objectEntityMapper: $this->objectMapper, + registerMapper: $this->registerMapper, + schemaMapper: $schemaMapper, + objectCacheService: $this->objectCacheService + ), + files: new \OCA\OpenRegister\Service\Object\RenderFileSources( + fileMapper: $this->fileMapper, + fileService: $this->fileService, + systemTagManager: $this->systemTagManager, + systemTagMapper: $this->systemTagMapper + ) + ), + enrichers: new \OCA\OpenRegister\Service\Object\RenderEnrichers( + translations: new \OCA\OpenRegister\Service\Object\RenderTranslations( + translationHandler: $this->createMock(\OCA\OpenRegister\Service\Object\TranslationHandler::class), + translationStatusService: $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), + translationMapper: $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), + languageService: $this->createMock(\OCA\OpenRegister\Service\LanguageService::class) + ), + derivations: new \OCA\OpenRegister\Service\Object\RenderDerivations( + computedFieldHandler: $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), + calculationEvaluator: $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), + linkedEntityEnricher: $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), + urnService: $this->createMock(\OCA\OpenRegister\Service\UrnService::class) + ) + ), + runtime: new \OCA\OpenRegister\Service\Object\RenderRuntime( + logger: $this->logger, + extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions() + ), + propertyRbacHandler: $this->propertyRbacHandler ); $ref = new ReflectionClass($handler); @@ -1624,24 +1654,39 @@ public function testResolveSchemaReferenceByUuidNotFound(): void { ->willReturn([]); $handler = new RenderObject( - $this->fileMapper, - $this->objectMapper, - $this->registerMapper, - $schemaMapper, - $this->systemTagManager, - $this->systemTagMapper, - $this->objectCacheService, - $this->propertyRbacHandler, - $this->logger, - $this->fileService, - $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), - $this->createMock(\OCA\OpenRegister\Service\Object\TranslationHandler::class), - $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), - $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), - $this->createMock(\OCA\OpenRegister\Service\UrnService::class), - $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), - $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), - $this->createMock(\OCA\OpenRegister\Service\LanguageService::class) + stores: new \OCA\OpenRegister\Service\Object\RenderStores( + mappers: new \OCA\OpenRegister\Service\Object\RenderMappers( + objectEntityMapper: $this->objectMapper, + registerMapper: $this->registerMapper, + schemaMapper: $schemaMapper, + objectCacheService: $this->objectCacheService + ), + files: new \OCA\OpenRegister\Service\Object\RenderFileSources( + fileMapper: $this->fileMapper, + fileService: $this->fileService, + systemTagManager: $this->systemTagManager, + systemTagMapper: $this->systemTagMapper + ) + ), + enrichers: new \OCA\OpenRegister\Service\Object\RenderEnrichers( + translations: new \OCA\OpenRegister\Service\Object\RenderTranslations( + translationHandler: $this->createMock(\OCA\OpenRegister\Service\Object\TranslationHandler::class), + translationStatusService: $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), + translationMapper: $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), + languageService: $this->createMock(\OCA\OpenRegister\Service\LanguageService::class) + ), + derivations: new \OCA\OpenRegister\Service\Object\RenderDerivations( + computedFieldHandler: $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), + calculationEvaluator: $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), + linkedEntityEnricher: $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), + urnService: $this->createMock(\OCA\OpenRegister\Service\UrnService::class) + ) + ), + runtime: new \OCA\OpenRegister\Service\Object\RenderRuntime( + logger: $this->logger, + extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions() + ), + propertyRbacHandler: $this->propertyRbacHandler ); $ref = new ReflectionClass($handler); @@ -4510,24 +4555,39 @@ public function testResolveSchemaReferencePathLookupExceptionFallsThrough(): voi ->willReturn([]); $handler = new RenderObject( - $this->fileMapper, - $this->objectMapper, - $this->registerMapper, - $schemaMapper, - $this->systemTagManager, - $this->systemTagMapper, - $this->objectCacheService, - $this->propertyRbacHandler, - $this->logger, - $this->fileService, - $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), - $this->createMock(\OCA\OpenRegister\Service\Object\TranslationHandler::class), - $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), - $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), - $this->createMock(\OCA\OpenRegister\Service\UrnService::class), - $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), - $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), - $this->createMock(\OCA\OpenRegister\Service\LanguageService::class) + stores: new \OCA\OpenRegister\Service\Object\RenderStores( + mappers: new \OCA\OpenRegister\Service\Object\RenderMappers( + objectEntityMapper: $this->objectMapper, + registerMapper: $this->registerMapper, + schemaMapper: $schemaMapper, + objectCacheService: $this->objectCacheService + ), + files: new \OCA\OpenRegister\Service\Object\RenderFileSources( + fileMapper: $this->fileMapper, + fileService: $this->fileService, + systemTagManager: $this->systemTagManager, + systemTagMapper: $this->systemTagMapper + ) + ), + enrichers: new \OCA\OpenRegister\Service\Object\RenderEnrichers( + translations: new \OCA\OpenRegister\Service\Object\RenderTranslations( + translationHandler: $this->createMock(\OCA\OpenRegister\Service\Object\TranslationHandler::class), + translationStatusService: $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), + translationMapper: $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), + languageService: $this->createMock(\OCA\OpenRegister\Service\LanguageService::class) + ), + derivations: new \OCA\OpenRegister\Service\Object\RenderDerivations( + computedFieldHandler: $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), + calculationEvaluator: $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), + linkedEntityEnricher: $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), + urnService: $this->createMock(\OCA\OpenRegister\Service\UrnService::class) + ) + ), + runtime: new \OCA\OpenRegister\Service\Object\RenderRuntime( + logger: $this->logger, + extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions() + ), + propertyRbacHandler: $this->propertyRbacHandler ); $ref = new ReflectionClass($handler); @@ -4867,24 +4927,39 @@ public function testResolveSchemaReferenceUuidBranch(): void { ->willReturn([$schema]); $handler = new RenderObject( - $this->fileMapper, - $this->objectMapper, - $this->registerMapper, - $schemaMapper, - $this->systemTagManager, - $this->systemTagMapper, - $this->objectCacheService, - $this->propertyRbacHandler, - $this->logger, - $this->fileService, - $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), - $this->createMock(\OCA\OpenRegister\Service\Object\TranslationHandler::class), - $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), - $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), - $this->createMock(\OCA\OpenRegister\Service\UrnService::class), - $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), - $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), - $this->createMock(\OCA\OpenRegister\Service\LanguageService::class) + stores: new \OCA\OpenRegister\Service\Object\RenderStores( + mappers: new \OCA\OpenRegister\Service\Object\RenderMappers( + objectEntityMapper: $this->objectMapper, + registerMapper: $this->registerMapper, + schemaMapper: $schemaMapper, + objectCacheService: $this->objectCacheService + ), + files: new \OCA\OpenRegister\Service\Object\RenderFileSources( + fileMapper: $this->fileMapper, + fileService: $this->fileService, + systemTagManager: $this->systemTagManager, + systemTagMapper: $this->systemTagMapper + ) + ), + enrichers: new \OCA\OpenRegister\Service\Object\RenderEnrichers( + translations: new \OCA\OpenRegister\Service\Object\RenderTranslations( + translationHandler: $this->createMock(\OCA\OpenRegister\Service\Object\TranslationHandler::class), + translationStatusService: $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), + translationMapper: $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), + languageService: $this->createMock(\OCA\OpenRegister\Service\LanguageService::class) + ), + derivations: new \OCA\OpenRegister\Service\Object\RenderDerivations( + computedFieldHandler: $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), + calculationEvaluator: $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), + linkedEntityEnricher: $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), + urnService: $this->createMock(\OCA\OpenRegister\Service\UrnService::class) + ) + ), + runtime: new \OCA\OpenRegister\Service\Object\RenderRuntime( + logger: $this->logger, + extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions() + ), + propertyRbacHandler: $this->propertyRbacHandler ); $ref = new ReflectionClass($handler); @@ -6440,24 +6515,39 @@ private function buildHandlerWithRealTranslation(bool $translationsAll): RenderO $registerMapper->method('find')->willReturn($register); return new RenderObject( - $this->fileMapper, - $this->objectMapper, - $registerMapper, - $schemaMapper, - $this->systemTagManager, - $this->systemTagMapper, - $this->objectCacheService, - $this->propertyRbacHandler, - $this->logger, - $this->fileService, - $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), - $translationHandler, - $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), - $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), - $this->createMock(\OCA\OpenRegister\Service\UrnService::class), - $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), - $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), - $languageService + stores: new \OCA\OpenRegister\Service\Object\RenderStores( + mappers: new \OCA\OpenRegister\Service\Object\RenderMappers( + objectEntityMapper: $this->objectMapper, + registerMapper: $registerMapper, + schemaMapper: $schemaMapper, + objectCacheService: $this->objectCacheService + ), + files: new \OCA\OpenRegister\Service\Object\RenderFileSources( + fileMapper: $this->fileMapper, + fileService: $this->fileService, + systemTagManager: $this->systemTagManager, + systemTagMapper: $this->systemTagMapper + ) + ), + enrichers: new \OCA\OpenRegister\Service\Object\RenderEnrichers( + translations: new \OCA\OpenRegister\Service\Object\RenderTranslations( + translationHandler: $translationHandler, + translationStatusService: $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), + translationMapper: $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), + languageService: $languageService + ), + derivations: new \OCA\OpenRegister\Service\Object\RenderDerivations( + computedFieldHandler: $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), + calculationEvaluator: $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), + linkedEntityEnricher: $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), + urnService: $this->createMock(\OCA\OpenRegister\Service\UrnService::class) + ) + ), + runtime: new \OCA\OpenRegister\Service\Object\RenderRuntime( + logger: $this->logger, + extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions() + ), + propertyRbacHandler: $this->propertyRbacHandler ); }//end buildHandlerWithRealTranslation() diff --git a/tests/Unit/Service/Object/RenderObjectUpdateRightTest.php b/tests/Unit/Service/Object/RenderObjectUpdateRightTest.php index e64d18ef83bb..233f52c48163 100644 --- a/tests/Unit/Service/Object/RenderObjectUpdateRightTest.php +++ b/tests/Unit/Service/Object/RenderObjectUpdateRightTest.php @@ -126,28 +126,41 @@ static function (string $id) use ($permissions, $actionList) { $translationHandler->method('resolveTranslationsForRender')->willReturnArgument(0); $render = new RenderObject( - $this->createMock(\OCA\OpenRegister\Files\Db\FileMapper::class), - $this->createMock(MagicMapper::class), - $this->createMock(RegisterMapper::class), - $schemaMapper, - $this->createMock(\OCP\SystemTag\ISystemTagManager::class), - $this->createMock(\OCP\SystemTag\ISystemTagObjectMapper::class), - $this->createMock(\OCA\OpenRegister\Service\Object\CacheHandler::class), - $this->createMock(\OCA\OpenRegister\Service\PropertyRbacHandler::class), - new NullLogger(), - $this->createMock(\OCA\OpenRegister\Service\FileService::class), - $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), - $translationHandler, - $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), - $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), - $this->createMock(\OCA\OpenRegister\Service\UrnService::class), - $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), - $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), - $this->createMock(\OCA\OpenRegister\Service\LanguageService::class), - null, - null, - null, - $container + stores: new \OCA\OpenRegister\Service\Object\RenderStores( + mappers: new \OCA\OpenRegister\Service\Object\RenderMappers( + objectEntityMapper: $this->createMock(MagicMapper::class), + registerMapper: $this->createMock(RegisterMapper::class), + schemaMapper: $schemaMapper, + objectCacheService: $this->createMock(\OCA\OpenRegister\Service\Object\CacheHandler::class) + ), + files: new \OCA\OpenRegister\Service\Object\RenderFileSources( + fileMapper: $this->createMock(\OCA\OpenRegister\Files\Db\FileMapper::class), + fileService: $this->createMock(\OCA\OpenRegister\Service\FileService::class), + systemTagManager: $this->createMock(\OCP\SystemTag\ISystemTagManager::class), + systemTagMapper: $this->createMock(\OCP\SystemTag\ISystemTagObjectMapper::class) + ) + ), + enrichers: new \OCA\OpenRegister\Service\Object\RenderEnrichers( + translations: new \OCA\OpenRegister\Service\Object\RenderTranslations( + translationHandler: $translationHandler, + translationStatusService: $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), + translationMapper: $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), + languageService: $this->createMock(\OCA\OpenRegister\Service\LanguageService::class) + ), + derivations: new \OCA\OpenRegister\Service\Object\RenderDerivations( + computedFieldHandler: $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), + calculationEvaluator: $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), + linkedEntityEnricher: $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), + urnService: $this->createMock(\OCA\OpenRegister\Service\UrnService::class) + ) + ), + runtime: new \OCA\OpenRegister\Service\Object\RenderRuntime( + logger: new NullLogger(), + extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions(objectSourceRegistry: null, fieldEncryptionHandler: null), + request: null, + container: $container + ), + propertyRbacHandler: $this->createMock(\OCA\OpenRegister\Service\PropertyRbacHandler::class) ); $entity = new ObjectEntity(); diff --git a/tests/Unit/Service/Object/RenderObjectWriteOnlyRedactionTest.php b/tests/Unit/Service/Object/RenderObjectWriteOnlyRedactionTest.php index 00e9c98b936f..49aabb5afcf4 100644 --- a/tests/Unit/Service/Object/RenderObjectWriteOnlyRedactionTest.php +++ b/tests/Unit/Service/Object/RenderObjectWriteOnlyRedactionTest.php @@ -112,25 +112,40 @@ private function renderer(Schema $schema, ?\Psr\Container\ContainerInterface $co $schemaMapper->method('find')->willReturn($schema); return new RenderObject( - $this->createMock(\OCA\OpenRegister\Files\Db\FileMapper::class), - $this->createMock(\OCA\OpenRegister\Db\MagicMapper::class), - $this->createMock(\OCA\OpenRegister\Db\RegisterMapper::class), - $schemaMapper, - $this->createMock(\OCP\SystemTag\ISystemTagManager::class), - $this->createMock(\OCP\SystemTag\ISystemTagObjectMapper::class), - $this->createMock(\OCA\OpenRegister\Service\Object\CacheHandler::class), - $this->realPropertyRbacHandler(), - $this->createMock(\Psr\Log\LoggerInterface::class), - $this->createMock(\OCA\OpenRegister\Service\FileService::class), - $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), - $this->translationPassthrough(), - $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), - $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), - $this->createMock(\OCA\OpenRegister\Service\UrnService::class), - $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), - $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), - $this->createMock(\OCA\OpenRegister\Service\LanguageService::class), - container: $container + stores: new \OCA\OpenRegister\Service\Object\RenderStores( + mappers: new \OCA\OpenRegister\Service\Object\RenderMappers( + objectEntityMapper: $this->createMock(\OCA\OpenRegister\Db\MagicMapper::class), + registerMapper: $this->createMock(\OCA\OpenRegister\Db\RegisterMapper::class), + schemaMapper: $schemaMapper, + objectCacheService: $this->createMock(\OCA\OpenRegister\Service\Object\CacheHandler::class) + ), + files: new \OCA\OpenRegister\Service\Object\RenderFileSources( + fileMapper: $this->createMock(\OCA\OpenRegister\Files\Db\FileMapper::class), + fileService: $this->createMock(\OCA\OpenRegister\Service\FileService::class), + systemTagManager: $this->createMock(\OCP\SystemTag\ISystemTagManager::class), + systemTagMapper: $this->createMock(\OCP\SystemTag\ISystemTagObjectMapper::class) + ) + ), + enrichers: new \OCA\OpenRegister\Service\Object\RenderEnrichers( + translations: new \OCA\OpenRegister\Service\Object\RenderTranslations( + translationHandler: $this->translationPassthrough(), + translationStatusService: $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), + translationMapper: $this->createMock(\OCA\OpenRegister\Db\TranslationMapper::class), + languageService: $this->createMock(\OCA\OpenRegister\Service\LanguageService::class) + ), + derivations: new \OCA\OpenRegister\Service\Object\RenderDerivations( + computedFieldHandler: $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), + calculationEvaluator: $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluator::class), + linkedEntityEnricher: $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), + urnService: $this->createMock(\OCA\OpenRegister\Service\UrnService::class) + ) + ), + runtime: new \OCA\OpenRegister\Service\Object\RenderRuntime( + logger: $this->createMock(\Psr\Log\LoggerInterface::class), + extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions(), + container: $container + ), + propertyRbacHandler: $this->realPropertyRbacHandler() ); } From 98e55ce21f54a2898f50e4323ecd0ea7753632fa Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 9 Nov 2026 05:16:36 +0000 Subject: [PATCH 2/3] test(objects): bare renderers in tests get the bundles the constructor now holds Assisted-by: ClaudeCode --- .../Object/RenderObjectFilesGoldenTest.php | 17 +++++++++++++++- .../RenderObjectReadMarkersGoldenTest.php | 4 ++-- .../RenderObjectRowsAndExtendGoldenTest.php | 16 +++++++++++++-- .../Unit/Service/Object/RenderObjectTest.php | 16 +++++++++++++-- .../Service/Rbac/ExplicitRevealRoutesTest.php | 20 ++++++++++++++----- 5 files changed, 61 insertions(+), 12 deletions(-) diff --git a/tests/Unit/Service/Object/RenderObjectFilesGoldenTest.php b/tests/Unit/Service/Object/RenderObjectFilesGoldenTest.php index f277bf1eef90..ddaf6d95604c 100644 --- a/tests/Unit/Service/Object/RenderObjectFilesGoldenTest.php +++ b/tests/Unit/Service/Object/RenderObjectFilesGoldenTest.php @@ -132,7 +132,22 @@ private function render(array $files, array &$calls): RenderObject { }); $render = (new ReflectionClass(RenderObject::class))->newInstanceWithoutConstructor(); - foreach (['fileMapper' => $fileMapper, 'systemTagMapper' => $tagMapper, 'systemTagManager' => $tagManager, 'container' => null, 'fileTagsCache' => []] as $property => $value) { + $stores = new \OCA\OpenRegister\Service\Object\RenderStores( + mappers: new \OCA\OpenRegister\Service\Object\RenderMappers( + objectEntityMapper: $this->createMock(\OCA\OpenRegister\Db\MagicMapperInterface::class), + registerMapper: $this->createMock(\OCA\OpenRegister\Db\RegisterMapperInterface::class), + schemaMapper: $this->createMock(\OCA\OpenRegister\Db\SchemaMapperInterface::class), + objectCacheService: $this->createMock(\OCA\OpenRegister\Service\Object\CacheHandlerInterface::class) + ), + files: new \OCA\OpenRegister\Service\Object\RenderFileSources( + fileMapper: $fileMapper, + fileService: $this->createMock(\OCA\OpenRegister\Service\FileReaderInterface::class), + systemTagManager: $tagManager, + systemTagMapper: $tagMapper + ) + ); + $runtime = new \OCA\OpenRegister\Service\Object\RenderRuntime(logger: $this->createMock(\Psr\Log\LoggerInterface::class), extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions(), container: null); + foreach (['stores' => $stores, 'runtime' => $runtime, 'fileTagsCache' => []] as $property => $value) { (new ReflectionProperty(RenderObject::class, $property))->setValue($render, $value); } diff --git a/tests/Unit/Service/Object/RenderObjectReadMarkersGoldenTest.php b/tests/Unit/Service/Object/RenderObjectReadMarkersGoldenTest.php index c25d14b6f639..4ac6f0866be5 100644 --- a/tests/Unit/Service/Object/RenderObjectReadMarkersGoldenTest.php +++ b/tests/Unit/Service/Object/RenderObjectReadMarkersGoldenTest.php @@ -106,7 +106,7 @@ private function handlerExpectingRuleCalls(int $calls): RenderObject { $rules = $this->createMock(PropertyRbacHandler::class); $rules->expects($this->exactly($calls))->method('filterReadableProperties')->willReturnArgument(1); - return $this->handlerWith(['propertyRbacHandler' => $rules, 'logger' => new NullLogger()]); + return $this->handlerWith(['propertyRbacHandler' => $rules, 'runtime' => new \OCA\OpenRegister\Service\Object\RenderRuntime(logger: new NullLogger(), extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions())]); } /** @@ -156,7 +156,7 @@ private function watcherHandler(?string $caller, bool $mayView): RenderObject { $container = $this->createMock(ContainerInterface::class); $container->method('get')->willReturn($watchers); - return $this->handlerWith(['container' => $container, 'logger' => new NullLogger()]); + return $this->handlerWith(['runtime' => new \OCA\OpenRegister\Service\Object\RenderRuntime(logger: new NullLogger(), extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions(), container: $container)]); } /** diff --git a/tests/Unit/Service/Object/RenderObjectRowsAndExtendGoldenTest.php b/tests/Unit/Service/Object/RenderObjectRowsAndExtendGoldenTest.php index 2da12181a29c..97b11c5b9471 100644 --- a/tests/Unit/Service/Object/RenderObjectRowsAndExtendGoldenTest.php +++ b/tests/Unit/Service/Object/RenderObjectRowsAndExtendGoldenTest.php @@ -230,8 +230,20 @@ private function translatingHandler(bool $all = false): RenderObject { return $this->handlerWith( [ - 'languageService' => $language, - 'translationHandler' => $translation, + 'enrichers' => new \OCA\OpenRegister\Service\Object\RenderEnrichers( + translations: new \OCA\OpenRegister\Service\Object\RenderTranslations( + translationHandler: $translation, + translationStatusService: $this->createMock(\OCA\OpenRegister\Service\TranslationStatusService::class), + translationMapper: $this->createMock(\OCA\OpenRegister\Db\TranslationMapperInterface::class), + languageService: $language + ), + derivations: new \OCA\OpenRegister\Service\Object\RenderDerivations( + computedFieldHandler: $this->createMock(\OCA\OpenRegister\Service\Object\SaveObject\ComputedFieldHandler::class), + calculationEvaluator: $this->createMock(\OCA\OpenRegister\Service\Calculation\CalculationEvaluatorInterface::class), + linkedEntityEnricher: $this->createMock(\OCA\OpenRegister\Service\Object\LinkedEntityEnricher::class), + urnService: $this->createMock(\OCA\OpenRegister\Service\UrnService::class) + ) + ), 'schemasCache' => [7 => $schema, 'seven' => $schema], 'registersCache' => [8 => $register, 'eight' => $register], ] diff --git a/tests/Unit/Service/Object/RenderObjectTest.php b/tests/Unit/Service/Object/RenderObjectTest.php index 7702d5d5c822..a233b1ed12d4 100644 --- a/tests/Unit/Service/Object/RenderObjectTest.php +++ b/tests/Unit/Service/Object/RenderObjectTest.php @@ -7108,9 +7108,21 @@ private function runSourceRefExtend(): array { $registry = $this->createMock(\OCA\OpenRegister\Service\ObjectSource\ObjectSourceRegistry::class); $registry->method('get')->willReturnCallback(static fn (string $name) => ($name === 'org-source') ? $provider : null); $handler = (new ReflectionClass(RenderObject::class))->newInstanceWithoutConstructor(); - $values = ['objectSourceRegistry' => $registry]; + $runtime = (new \ReflectionProperty(RenderObject::class, 'runtime'))->getValue($this->handler); + $values = [ + 'runtime' => new \OCA\OpenRegister\Service\Object\RenderRuntime( + logger: $runtime->logger, + extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions( + objectSourceRegistry: $registry, + fieldEncryptionHandler: $runtime->extensions->fieldEncryptionHandler, + lensResolver: $runtime->extensions->lensResolver + ), + request: $runtime->request, + container: $runtime->container + ), + ]; foreach ((new ReflectionClass(RenderObject::class))->getProperties() as $prop) { - if ($prop->isStatic() === false && $prop->isInitialized($this->handler) === true && $prop->getName() !== 'objectSourceRegistry') { + if ($prop->isStatic() === false && $prop->isInitialized($this->handler) === true && $prop->getName() !== 'runtime') { $values[$prop->getName()] = $prop->getValue($this->handler); } } diff --git a/tests/Unit/Service/Rbac/ExplicitRevealRoutesTest.php b/tests/Unit/Service/Rbac/ExplicitRevealRoutesTest.php index 86a7081cb2b2..79f83315a9ea 100644 --- a/tests/Unit/Service/Rbac/ExplicitRevealRoutesTest.php +++ b/tests/Unit/Service/Rbac/ExplicitRevealRoutesTest.php @@ -191,7 +191,7 @@ public function testAListRowIsMaskedWithItsNameCopy(): void { $masker = new ExplicitRevealMasker(new ExplicitReveal(), $rbac, $this->createMock(IUserSession::class), new RevealRecording($this->createMock(LoggerInterface::class))); $container = $this->createMock(ContainerInterface::class); $container->method('get')->willReturn($masker); - $render = $this->bare(RenderObject::class, ['container' => $container]); + $render = $this->bare(RenderObject::class, ['runtime' => new \OCA\OpenRegister\Service\Object\RenderRuntime(logger: $this->createMock(\Psr\Log\LoggerInterface::class), extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions(), container: $container)]); $row = $this->call($render, 'maskRowReveals', [ 'row' => ['id' => '11111111-1111-4111-8111-111111111111', 'citizenServiceNumber' => self::BSN, '@self' => ['name' => self::BSN]], @@ -237,10 +237,9 @@ public function testAnEncryptedRowIsMaskedAfterDecryption(): void { $encryption->method('decryptProperties')->willReturnCallback( static fn (array $data): array => (['citizenServiceNumber' => self::BSN] + $data) ); - $render = $this->masking(); + $render = $this->bare(RenderObject::class, ['runtime' => $this->maskingRuntime($encryption)]); $reflection = new ReflectionClass($render); $reflection->getProperty('propertyRbacHandler')->setValue($render, $rbac); - $reflection->getProperty('fieldEncryptionHandler')->setValue($render, $encryption); $reflection->getProperty('schemasCache')->setValue($render, [7 => $schema]); $row = $this->call($render, 'redactArrayRow', [ @@ -257,12 +256,23 @@ public function testAnEncryptedRowIsMaskedAfterDecryption(): void { * @return RenderObject The render. */ private function masking(): RenderObject { + return $this->bare(RenderObject::class, ['runtime' => $this->maskingRuntime(null)]); + }//end masking() + + /** + * The runtime of a render that can mask explicit-reveal values. + * + * @param FieldEncryptionHandler|null $encryption The field encryption handler, if any. + * + * @return \OCA\OpenRegister\Service\Object\RenderRuntime The runtime. + */ + private function maskingRuntime(?FieldEncryptionHandler $encryption): \OCA\OpenRegister\Service\Object\RenderRuntime { $rbac = $this->createMock(PropertyRbacHandler::class); $rbac->method('canReadProperty')->willReturn(true); $masker = new ExplicitRevealMasker(new ExplicitReveal(), $rbac, $this->createMock(IUserSession::class), new RevealRecording($this->createMock(LoggerInterface::class))); $container = $this->createMock(ContainerInterface::class); $container->method('get')->willReturn($masker); - return $this->bare(RenderObject::class, ['container' => $container]); - }//end masking() + return new \OCA\OpenRegister\Service\Object\RenderRuntime(logger: $this->createMock(\Psr\Log\LoggerInterface::class), extensions: new \OCA\OpenRegister\Service\Object\RenderReadExtensions(fieldEncryptionHandler: $encryption), container: $container); + }//end maskingRuntime() }//end class From 268f9c016751faefd77bd1ce1358c2e3622e1de0 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 9 Nov 2026 05:28:03 +0000 Subject: [PATCH 3/3] style(objects): keep the row translation call under the line limit Assisted-by: ClaudeCode --- lib/Service/Object/RenderObject.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Service/Object/RenderObject.php b/lib/Service/Object/RenderObject.php index 898721e7b229..b7bf608ca183 100644 --- a/lib/Service/Object/RenderObject.php +++ b/lib/Service/Object/RenderObject.php @@ -639,8 +639,9 @@ private function translateEntityRow(ObjectEntity $row): void { $register = $this->getRegister(id: $row->getRegister()); } + $translations = $this->enrichers->translations->translationHandler; $row->setObject( - $this->enrichers->translations->translationHandler->resolveTranslationsForRender(objectData: $row->getObject(), schema: $schema, register: $register) + $translations->resolveTranslationsForRender(objectData: $row->getObject(), schema: $schema, register: $register) ); }//end translateEntityRow()