kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 17:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch '1.14' into 2.0

Browse source 
* 1.14:
  [ApiBundle][Image] Prevent resolving non-serialized image paths
This commit is contained in:
Grzegorz Sadowski 2024-10-23 15:44:53 +02:00
commit f538917c4b
No known key found for this signature in database
GPG key ID: EF87FF4E6E3BD364
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Sylius/Bundle/ApiBundle/Serializer/Normalizer/ImageNormalizer.php
View file

@ -47,7 +47,10 @@ class ImageNormalizer implements NormalizerInterface, NormalizerAwareInterface
/** @var array<string, string> $data */
$data = $this->normalizer->normalize($object, $format, $context);
$data['path'] = $this->resolvePath($data);
if (true === array_key_exists('path', $data)) {
$data['path'] = $this->resolvePath($data);
}
return $data;
}

20
src/Sylius/Bundle/ApiBundle/spec/Serializer/Normalizer/ImageNormalizerSpec.php
View file

@ -166,6 +166,26 @@ final class ImageNormalizerSpec extends ObjectBehavior
;
}
function it_does_not_resolve_image_path_if_path_is_not_serialized(
CacheManager $cacheManager,
RequestStack $requestStack,
NormalizerInterface $normalizer,
Request $request,
ParameterBag $queryBag,
ImageInterface $image,
): void {
$normalizer
->normalize($image, null, ['sylius_image_normalizer_already_called' => true])
->shouldBeCalled()
->willReturn(['id' => 1])
;
$this->normalize($image, null, [])->shouldReturn(['id' => 1]);
$cacheManager->getBrowserPath(Argument::any(), Argument::any())->shouldNotHaveBeenCalled();
$requestStack->getCurrentRequest()->shouldNotHaveBeenCalled();
}
function it_applies_given_image_filter(
CacheManager $cacheManager,
RequestStack $requestStack,