From 336987304c6ee9a32f2ead72d75455b9f0138c75 Mon Sep 17 00:00:00 2001 From: Antoine Bluchet Date: Fri, 9 Aug 2024 19:39:12 +0200 Subject: [PATCH] Merge 3.4 (#6507) * tests: remove output suffix after reverting * cs: remove unnecessary comments (#6408) * fix(elasticsearch): change normalize return type to compatible with other normalizers (#6493) * style: various cs fixes (#6504) * cs: fixes * chore: phpstan fixes * style: cs fixes --------- Co-authored-by: Takashi Kanemoto <4360663+ttskch@users.noreply.github.com> Co-authored-by: Koen Pasman <118996061+Koenstell@users.noreply.github.com> --- AbstractCollectionNormalizer.php | 1 - JsonEncoder.php | 1 - 2 files changed, 2 deletions(-) diff --git a/AbstractCollectionNormalizer.php b/AbstractCollectionNormalizer.php index c35033c..bf983c3 100644 --- a/AbstractCollectionNormalizer.php +++ b/AbstractCollectionNormalizer.php @@ -39,7 +39,6 @@ abstract class AbstractCollectionNormalizer implements NormalizerInterface, Norm /** * This constant must be overridden in the child class. */ - // @noRector \Rector\Php81\Rector\ClassConst\FinalizePublicClassConstantRector public const FORMAT = 'to-override'; public function __construct(protected ResourceClassResolverInterface $resourceClassResolver, protected string $pageParameterName, protected ?ResourceMetadataCollectionFactoryInterface $resourceMetadataFactory = null) diff --git a/JsonEncoder.php b/JsonEncoder.php index 4b1be32..f7a34ca 100644 --- a/JsonEncoder.php +++ b/JsonEncoder.php @@ -26,7 +26,6 @@ */ final class JsonEncoder implements EncoderInterface, DecoderInterface { - // @noRector \Rector\Php81\Rector\Property\ReadOnlyPropertyRector public function __construct(private readonly string $format, private ?BaseJsonEncoder $jsonEncoder = null) { if (null !== $this->jsonEncoder) {