Merge 3.4 (#6507)

soyuka · ttskch · Koenstell · web-flow · commit 336987304c6e · 2024-08-09T19:39:12.000+02:00
* 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 &lt;4360663+ttskch@users.noreply.github.com&gt;
Co-authored-by: Koen Pasman &lt;118996061+Koenstell@users.noreply.github.com&gt;
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) {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@`
`26`	`26`	`*/`
`27`	`27`	`final class JsonEncoder implements EncoderInterface, DecoderInterface`
`28`	`28`	`{`
`29`		`- // @noRector \Rector\Php81\Rector\Property\ReadOnlyPropertyRector`
`30`	`29`	`public function __construct(private readonly string $format, private ?BaseJsonEncoder $jsonEncoder = null)`
`31`	`30`	`{`
`32`	`31`	`if (null !== $this->jsonEncoder) {`