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]>

Tests/JsonSchema/SchemaFactoryTest.php

@@ -95,9 +95,7 @@ public function testHasRootDefinitionKeyBuildSchema(): void
         $definitions = $resultSchema->getDefinitions();
         $rootDefinitionKey = $resultSchema->getRootDefinitionKey();
 
-        // @noRector
         $this->assertTrue(isset($definitions[$rootDefinitionKey]));
-        // @noRector
         $this->assertTrue(isset($definitions[$rootDefinitionKey]['properties']));
         $properties = $resultSchema['definitions'][$rootDefinitionKey]['properties'];
         $this->assertArrayHasKey('data', $properties);
@@ -132,7 +130,6 @@ public function testSchemaTypeBuildSchema(): void
         $definitionName = 'Dummy.jsonapi';
 
         $this->assertNull($resultSchema->getRootDefinitionKey());
-        // @noRector
         $this->assertTrue(isset($resultSchema['properties']));
         $this->assertArrayHasKey('links', $resultSchema['properties']);
         $this->assertArrayHasKey('self', $resultSchema['properties']['links']['properties']);
@@ -160,7 +157,6 @@ public function testSchemaTypeBuildSchema(): void
         $resultSchema = $this->schemaFactory->buildSchema(Dummy::class, 'jsonapi', Schema::TYPE_OUTPUT, forceCollection: true);
 
         $this->assertNull($resultSchema->getRootDefinitionKey());
-        // @noRector
         $this->assertTrue(isset($resultSchema['properties']));
         $this->assertArrayHasKey('links', $resultSchema['properties']);
         $this->assertArrayHasKey('self', $resultSchema['properties']['links']['properties']);