Skip to content

Commit ea16999

Browse files
committed
Revert "construct"
This reverts commit d568330.
1 parent c0157f7 commit ea16999

4 files changed

Lines changed: 3 additions & 13 deletions

File tree

src/Laravel/ApiPlatformDeferredProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,9 @@ public function register(): void
266266
)
267267
),
268268
$app->make('filters'),
269-
$app->make(ResourceClassResolverInterface::class),
270269
$app->make(CamelCaseToSnakeCaseNameConverter::class),
271270
$this->app->make(LoggerInterface::class),
271+
$app->make(ResourceClassResolverInterface::class),
272272
),
273273
$app->make('filters')
274274
),

src/Metadata/Resource/Factory/ParameterResourceMetadataCollectionFactory.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,11 @@ public function __construct(
5454
private readonly PropertyMetadataFactoryInterface $propertyMetadataFactory,
5555
private readonly ?ResourceMetadataCollectionFactoryInterface $decorated = null,
5656
private readonly ?ContainerInterface $filterLocator = null,
57-
?ResourceClassResolverInterface $resourceClassResolver = null,
5857
private readonly ?NameConverterInterface $nameConverter = null,
5958
private readonly ?LoggerInterface $logger = null,
59+
?ResourceClassResolverInterface $resourceClassResolver = null,
6060
) {
6161
$this->resourceClassResolver = $resourceClassResolver;
62-
//$this->resourceMetadataFactory = $this->decorated;
6362
}
6463

6564
public function create(string $resourceClass): ResourceMetadataCollection

src/Metadata/Tests/Resource/Factory/ParameterResourceMetadataCollectionFactoryTest.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
use ApiPlatform\Metadata\QueryParameter;
2525
use ApiPlatform\Metadata\Resource\Factory\AttributesResourceMetadataCollectionFactory;
2626
use ApiPlatform\Metadata\Resource\Factory\ParameterResourceMetadataCollectionFactory;
27-
use ApiPlatform\Metadata\ResourceClassResolverInterface;
2827
use ApiPlatform\Metadata\Tests\Fixtures\ApiResource\WithLimitedPropertyParameter;
2928
use ApiPlatform\Metadata\Tests\Fixtures\ApiResource\WithParameter;
3029
use ApiPlatform\OpenApi\Model\Parameter;
@@ -296,15 +295,11 @@ public function testNestedPropertyWithNameConverter(): void
296295
$filterLocator = $this->createStub(ContainerInterface::class);
297296
$filterLocator->method('has')->willReturn(false);
298297

299-
$resourceClassResolver = $this->createStub(ResourceClassResolverInterface::class);
300-
$resourceClassResolver->method('isResourceClass')->willReturn(true);
301-
302298
$parameterFactory = new ParameterResourceMetadataCollectionFactory(
303299
$nameCollection,
304300
$propertyMetadata,
305301
new AttributesResourceMetadataCollectionFactory(),
306302
$filterLocator,
307-
$resourceClassResolver,
308303
new CamelCaseToSnakeCaseNameConverter()
309304
);
310305

@@ -350,15 +345,11 @@ static function (string $class, string $property): ApiProperty {
350345
$filterLocator = $this->createStub(ContainerInterface::class);
351346
$filterLocator->method('has')->willReturn(false);
352347

353-
$resourceClassResolver = $this->createStub(ResourceClassResolverInterface::class);
354-
$resourceClassResolver->method('isResourceClass')->willReturn(true);
355-
356348
return new ParameterResourceMetadataCollectionFactory(
357349
$nameCollection,
358350
$propertyMetadata,
359351
new AttributesResourceMetadataCollectionFactory(),
360352
$filterLocator,
361-
$resourceClassResolver,
362353
new CamelCaseToSnakeCaseNameConverter(),
363354
);
364355
}

src/Symfony/Bundle/Resources/config/metadata/resource.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,9 @@
150150
service('api_platform.metadata.property.metadata_factory'),
151151
service('api_platform.metadata.resource.metadata_collection_factory.parameter.inner'),
152152
service('api_platform.filter_locator')->ignoreOnInvalid(),
153-
service('api_platform.resource_class_resolver')->ignoreOnInvalid(),
154153
service('api_platform.name_converter')->ignoreOnInvalid(),
155154
service('logger')->ignoreOnInvalid(),
155+
service('api_platform.resource_class_resolver')->ignoreOnInvalid(),
156156
]);
157157

158158
$services->set('api_platform.metadata.resource.metadata_collection_factory.cached', CachedResourceMetadataCollectionFactory::class)

0 commit comments

Comments
 (0)