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 <[email protected]> Co-authored-by: Koen Pasman <[email protected]>
api-platform · Aug 9, 2024 · 3369873 · 3369873
1 parent 052f76b
commit 3369873
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git 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
@@ -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) {