Skip to content

Commit 7e5e0aa

Browse files
soyukattskchKoenstell
authored
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]>
1 parent 3f48c6f commit 7e5e0aa

File tree

14 files changed

+3
-39
lines changed

14 files changed

+3
-39
lines changed

‎src/Elasticsearch/Serializer/ItemNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function supportsDenormalization(mixed $data, string $type, ?string $form
6464
/**
6565
* {@inheritdoc}
6666
*/
67-
public function normalize(mixed $object, ?string $format = null, array $context = []): array
67+
public function normalize(mixed $object, ?string $format = null, array $context = []): \ArrayObject|array|string|int|float|bool|null
6868
{
6969
return $this->decorated->normalize($object, $format, $context);
7070
}

‎src/Hydra/Tests/JsonSchema/SchemaFactoryTest.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ public function testHasRootDefinitionKeyBuildSchema(): void
8585
$definitions = $resultSchema->getDefinitions();
8686
$rootDefinitionKey = $resultSchema->getRootDefinitionKey();
8787

88-
// @noRector
8988
$this->assertTrue(isset($definitions[$rootDefinitionKey]));
90-
// @noRector
9189
$this->assertTrue(isset($definitions[$rootDefinitionKey]['properties']));
9290
$properties = $resultSchema['definitions'][$rootDefinitionKey]['properties'];
9391
$this->assertArrayHasKey('@context', $properties);
@@ -124,9 +122,7 @@ public function testSchemaTypeBuildSchema(): void
124122
$definitionName = 'Dummy.jsonld';
125123

126124
$this->assertNull($resultSchema->getRootDefinitionKey());
127-
// @noRector
128125
$this->assertTrue(isset($resultSchema['properties']));
129-
// @noRector
130126
$this->assertTrue(isset($resultSchema['properties']['hydra:member']));
131127
$this->assertArrayHasKey('hydra:totalItems', $resultSchema['properties']);
132128
$this->assertArrayHasKey('hydra:view', $resultSchema['properties']);
@@ -139,9 +135,7 @@ public function testSchemaTypeBuildSchema(): void
139135
$resultSchema = $this->schemaFactory->buildSchema(Dummy::class, 'jsonld', Schema::TYPE_OUTPUT, null, null, null, true);
140136

141137
$this->assertNull($resultSchema->getRootDefinitionKey());
142-
// @noRector
143138
$this->assertTrue(isset($resultSchema['properties']));
144-
// @noRector
145139
$this->assertTrue(isset($resultSchema['properties']['hydra:member']));
146140
$this->assertArrayHasKey('hydra:totalItems', $resultSchema['properties']);
147141
$this->assertArrayHasKey('hydra:view', $resultSchema['properties']);
@@ -157,9 +151,7 @@ public function testHasHydraViewNavigationBuildSchema(): void
157151
$resultSchema = $this->schemaFactory->buildSchema(Dummy::class, 'jsonld', Schema::TYPE_OUTPUT, new GetCollection());
158152

159153
$this->assertNull($resultSchema->getRootDefinitionKey());
160-
// @noRector
161154
$this->assertTrue(isset($resultSchema['properties']));
162-
// @noRector
163155
$this->assertTrue(isset($resultSchema['properties']['hydra:view']));
164156
$this->assertArrayHasKey('properties', $resultSchema['properties']['hydra:view']);
165157
$this->assertArrayHasKey('hydra:first', $resultSchema['properties']['hydra:view']['properties']);

‎src/JsonApi/Tests/JsonSchema/SchemaFactoryTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,7 @@ public function testHasRootDefinitionKeyBuildSchema(): void
9595
$definitions = $resultSchema->getDefinitions();
9696
$rootDefinitionKey = $resultSchema->getRootDefinitionKey();
9797

98-
// @noRector
9998
$this->assertTrue(isset($definitions[$rootDefinitionKey]));
100-
// @noRector
10199
$this->assertTrue(isset($definitions[$rootDefinitionKey]['properties']));
102100
$properties = $resultSchema['definitions'][$rootDefinitionKey]['properties'];
103101
$this->assertArrayHasKey('data', $properties);
@@ -132,7 +130,6 @@ public function testSchemaTypeBuildSchema(): void
132130
$definitionName = 'Dummy.jsonapi';
133131

134132
$this->assertNull($resultSchema->getRootDefinitionKey());
135-
// @noRector
136133
$this->assertTrue(isset($resultSchema['properties']));
137134
$this->assertArrayHasKey('links', $resultSchema['properties']);
138135
$this->assertArrayHasKey('self', $resultSchema['properties']['links']['properties']);
@@ -160,7 +157,6 @@ public function testSchemaTypeBuildSchema(): void
160157
$resultSchema = $this->schemaFactory->buildSchema(Dummy::class, 'jsonapi', Schema::TYPE_OUTPUT, forceCollection: true);
161158

162159
$this->assertNull($resultSchema->getRootDefinitionKey());
163-
// @noRector
164160
$this->assertTrue(isset($resultSchema['properties']));
165161
$this->assertArrayHasKey('links', $resultSchema['properties']);
166162
$this->assertArrayHasKey('self', $resultSchema['properties']['links']['properties']);

‎src/JsonSchema/Command/JsonSchemaGenerateCommand.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
*/
3232
final class JsonSchemaGenerateCommand extends Command
3333
{
34-
// @noRector \Rector\Php81\Rector\Property\ReadOnlyPropertyRector
3534
private array $formats;
3635

3736
public function __construct(private readonly SchemaFactoryInterface $schemaFactory, array $formats)

‎src/JsonSchema/Tests/SchemaFactoryTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ public function testBuildSchemaForNonResourceClass(): void
9090
$definitions = $resultSchema->getDefinitions();
9191

9292
$this->assertSame((new \ReflectionClass(NotAResource::class))->getShortName(), $rootDefinitionKey);
93-
// @noRector
9493
$this->assertTrue(isset($definitions[$rootDefinitionKey]));
9594
$this->assertArrayHasKey('type', $definitions[$rootDefinitionKey]);
9695
$this->assertSame('object', $definitions[$rootDefinitionKey]['type']);
@@ -166,7 +165,6 @@ public function testBuildSchemaForNonResourceClassWithUnionIntersectTypes(): voi
166165
$definitions = $resultSchema->getDefinitions();
167166

168167
$this->assertSame((new \ReflectionClass(NotAResourceWithUnionIntersectTypes::class))->getShortName(), $rootDefinitionKey);
169-
// @noRector
170168
$this->assertTrue(isset($definitions[$rootDefinitionKey]));
171169
$this->assertArrayHasKey('type', $definitions[$rootDefinitionKey]);
172170
$this->assertSame('object', $definitions[$rootDefinitionKey]['type']);
@@ -249,7 +247,6 @@ public function testBuildSchemaWithSerializerGroups(): void
249247
$definitions = $resultSchema->getDefinitions();
250248

251249
$this->assertSame((new \ReflectionClass(OverriddenOperationDummy::class))->getShortName().'-'.$serializerGroup, $rootDefinitionKey);
252-
// @noRector
253250
$this->assertTrue(isset($definitions[$rootDefinitionKey]));
254251
$this->assertArrayHasKey('type', $definitions[$rootDefinitionKey]);
255252
$this->assertSame('object', $definitions[$rootDefinitionKey]['type']);
@@ -307,7 +304,6 @@ public function testBuildSchemaForAssociativeArray(): void
307304
$definitions = $resultSchema->getDefinitions();
308305

309306
$this->assertSame((new \ReflectionClass(NotAResource::class))->getShortName(), $rootDefinitionKey);
310-
// @noRector
311307
$this->assertTrue(isset($definitions[$rootDefinitionKey]));
312308
$this->assertArrayHasKey('properties', $definitions[$rootDefinitionKey]);
313309
$this->assertArrayHasKey('foo', $definitions[$rootDefinitionKey]['properties']);

‎src/JsonSchema/Tests/SchemaTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,10 @@ public function testDefinitions(string $version, array $baseDefinitions): void
6767
if (Schema::VERSION_OPENAPI === $version) {
6868
$this->assertArrayHasKey('schemas', $schema['components']);
6969
} else {
70-
// @noRector
7170
$this->assertTrue(isset($schema['definitions']));
7271
}
7372

7473
$definitions = $schema->getDefinitions();
75-
// @noRector
7674
$this->assertTrue(isset($definitions['foo']));
7775

7876
$this->assertArrayNotHasKey('definitions', $schema->getArrayCopy(false));

‎src/Metadata/Tests/Resource/Factory/AttributesResourceMetadataCollectionFactoryTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ class: AttributeResource::class,
9595
priority: 4,
9696
status: 301,
9797
provider: AttributeResourceProvider::class,
98-
// @noRector \Rector\Php81\Rector\Array_\FirstClassCallableRector
9998
processor: [AttributeResourceProcessor::class, 'process']
10099
),
101100
'_api_/dummy/{dummyId}/attribute_resources/{identifier}{._format}_patch' => new Patch(
@@ -106,14 +105,12 @@ class: AttributeResource::class,
106105
priority: 5,
107106
status: 301,
108107
provider: AttributeResourceProvider::class,
109-
// @noRector \Rector\Php81\Rector\Array_\FirstClassCallableRector
110108
processor: [AttributeResourceProcessor::class, 'process']
111109
),
112110
],
113111
inputFormats: ['json' => ['application/merge-patch+json']],
114112
status: 301,
115113
provider: AttributeResourceProvider::class,
116-
// @noRector \Rector\Php81\Rector\Array_\FirstClassCallableRector
117114
processor: [AttributeResourceProcessor::class, 'process']
118115
),
119116
]),

‎src/Serializer/AbstractCollectionNormalizer.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ abstract class AbstractCollectionNormalizer implements NormalizerInterface, Norm
3939
/**
4040
* This constant must be overridden in the child class.
4141
*/
42-
// @noRector \Rector\Php81\Rector\ClassConst\FinalizePublicClassConstantRector
4342
public const FORMAT = 'to-override';
4443

4544
public function __construct(protected ResourceClassResolverInterface $resourceClassResolver, protected string $pageParameterName, protected ?ResourceMetadataCollectionFactoryInterface $resourceMetadataFactory = null)

‎src/Serializer/JsonEncoder.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
*/
2727
final class JsonEncoder implements EncoderInterface, DecoderInterface
2828
{
29-
// @noRector \Rector\Php81\Rector\Property\ReadOnlyPropertyRector
3029
public function __construct(private readonly string $format, private ?BaseJsonEncoder $jsonEncoder = null)
3130
{
3231
if (null !== $this->jsonEncoder) {

‎src/Symfony/Bundle/DependencyInjection/Compiler/ElasticsearchClientPass.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,8 @@ public function process(ContainerBuilder $container): void
5757
$clientDefinition = $container->getDefinition('api_platform.elasticsearch.client');
5858

5959
if (!$clientConfiguration) {
60-
// @noRector \Rector\Php81\Rector\Array_\FirstClassCallableRector
6160
$clientDefinition->setFactory([$builderName, 'build']);
6261
} else {
63-
// @noRector \Rector\Php81\Rector\Array_\FirstClassCallableRector
6462
$clientDefinition->setFactory([$builderName, 'fromConfig']);
6563
$clientDefinition->setArguments([$clientConfiguration]);
6664
}

0 commit comments

Comments
 (0)