From 653545a1ec61ed6b763036e3e7d203c196aa4fe0 Mon Sep 17 00:00:00 2001 From: pkly Date: Tue, 28 Apr 2026 08:17:17 +0200 Subject: [PATCH] Fix virtual properties being set even if no input was sent, along with the parent inputs --- src/Resolve/Handler/EntityPropertyHandler.php | 9 +- .../Feature/Resolver/VisitedTrackingTest.php | 134 ++++++++++++++++++ 2 files changed, 138 insertions(+), 5 deletions(-) create mode 100644 tests/Feature/Resolver/VisitedTrackingTest.php diff --git a/src/Resolve/Handler/EntityPropertyHandler.php b/src/Resolve/Handler/EntityPropertyHandler.php index a76ce1e..8c44dac 100644 --- a/src/Resolve/Handler/EntityPropertyHandler.php +++ b/src/Resolve/Handler/EntityPropertyHandler.php @@ -80,6 +80,7 @@ public function handle( // input bag (e.g. routing them to attributes); inherit it when the // virtual itself didn't declare one. $virtualDefaultBag = $meta->bag ?? $defaultBag; + $anyInputVisited = false; foreach ($meta->virtual as $target => $virtualMeta) { if ($virtualMeta instanceof Dynamic @@ -96,8 +97,6 @@ public function handle( Util::buildValidationPath([...$prefix, $target]) ); - $dto->visit($name, $target); - continue; } @@ -106,6 +105,8 @@ public function handle( if (null !== $resolved) { $raw = $resolved->raw; $coercion = $resolved->coercion; + $dto->visit($name, $target); + $anyInputVisited = true; } else { $raw = TypeInfoUtils::isCollection($virtualMeta->type) ? [] : null; $coercion = null !== $virtualMeta->coercer @@ -137,8 +138,6 @@ public function handle( $phases, $validationPath ); - - $dto->visit($name, $target); } if (empty($fields)) { @@ -171,6 +170,6 @@ public function handle( Util::buildValidationPath([...$prefix, ...$meta->getRealPathSegments()]) ); - return true; + return $anyInputVisited; } } diff --git a/tests/Feature/Resolver/VisitedTrackingTest.php b/tests/Feature/Resolver/VisitedTrackingTest.php new file mode 100644 index 0000000..7bf97a1 --- /dev/null +++ b/tests/Feature/Resolver/VisitedTrackingTest.php @@ -0,0 +1,134 @@ +resolver = static::getService(DtoResolver::class); + $this->em = static::getService(EntityManagerInterface::class); + + new SchemaTool($this->em)->createSchema( + $this->em->getMetadataFactory()->getAllMetadata() + ); + } + + protected function tearDown(): void + { + new SchemaTool($this->em)->dropSchema( + $this->em->getMetadataFactory()->getAllMetadata() + ); + + parent::tearDown(); + } + + public function testGetVisitedReturnsExactlyTheReceivedScalarFields(): void + { + $dto = $this->resolver->resolve( + ScalarDto::class, + new Request(request: [ + 'intField' => '5', + 'stringField' => 'x', + ]) + ); + + $visited = $dto->getVisited(); + sort($visited); + + static::assertSame(['intField', 'stringField'], $visited); + } + + public function testGetVisitedIsEmptyWhenNoFieldsReceived(): void + { + $dto = $this->resolver->resolve( + ScalarDto::class, + new Request() + ); + + static::assertSame([], $dto->getVisited()); + } + + public function testFindOneByVisitedVirtualPropertyMarksVirtualAndParentWhenInputSent(): void + { + $entity = $this->createEntity(); + + $dto = $this->resolver->resolve( + SimpleFindDto::class, + new Request(request: ['inputId' => (string)$entity->getId()]) + ); + + static::assertTrue($dto->visited('entity'), 'parent FindOneBy property must be visited when virtual got input'); + static::assertTrue( + $dto->visitedVirtualProperty('entity', 'id'), + 'virtual `id` must be visited when its `inputId` was provided' + ); + } + + public function testFindOneByNotVisitedWhenNoInput(): void + { + $dto = $this->resolver->resolve( + SimpleFindDto::class, + new Request() + ); + + static::assertFalse($dto->visited('entity'), 'parent must NOT be visited when no virtual input was sent'); + static::assertFalse( + $dto->visitedVirtualProperty('entity', 'id'), + 'virtual must NOT be visited when its input was absent' + ); + } + + public function testFindByVisitedVirtualPropertyMarksVirtualAndParentWhenInputSent(): void + { + $a = $this->createEntity(); + $b = $this->createEntity(); + + $dto = $this->resolver->resolve( + SimpleFindByDto::class, + new Request(request: ['inputIds' => [(string)$a->getId(), (string)$b->getId()]]) + ); + + static::assertTrue($dto->visited('entities')); + static::assertTrue($dto->visitedVirtualProperty('entities', 'id')); + } + + public function testFindByNotVisitedWhenNoInput(): void + { + $dto = $this->resolver->resolve( + SimpleFindByDto::class, + new Request() + ); + + static::assertFalse($dto->visited('entities')); + static::assertFalse($dto->visitedVirtualProperty('entities', 'id')); + } + + private function createEntity(): SimpleEntity + { + $entity = new SimpleEntity(); + $this->em->persist($entity); + $this->em->flush(); + + return $entity; + } +}