From 7dd6a765eeab611b2be1f8cf66a5c959bbff185f Mon Sep 17 00:00:00 2001 From: soyuka Date: Wed, 30 Sep 2026 14:58:05 +0200 Subject: [PATCH 1/2] test: fix phpunit 13 and DefinitionNameFactory reds on 5.0 --- src/OpenApi/Tests/Factory/OpenApiFactoryTest.php | 8 ++++---- .../Doctrine/EventListener/PurgeHttpCacheListenerTest.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/OpenApi/Tests/Factory/OpenApiFactoryTest.php b/src/OpenApi/Tests/Factory/OpenApiFactoryTest.php index 5a77e1131f..1cb077cf8e 100644 --- a/src/OpenApi/Tests/Factory/OpenApiFactoryTest.php +++ b/src/OpenApi/Tests/Factory/OpenApiFactoryTest.php @@ -1547,8 +1547,8 @@ public function getOpenApiParameters(MetadataParameter $parameter): Parameter|ar }; $filterLocator = $this->createMock(ContainerInterface::class); - $filterLocator->method('has')->with('f3notfilterinterface')->willReturn(true); - $filterLocator->method('get')->with('f3notfilterinterface')->willReturn($filter); + $filterLocator->expects($this->atLeastOnce())->method('has')->with('f3notfilterinterface')->willReturn(true); + $filterLocator->expects($this->atLeastOnce())->method('get')->with('f3notfilterinterface')->willReturn($filter); $parameters = $this->getGeneratedQueryParameters( ['name' => new QueryParameter(filter: 'f3notfilterinterface', openApi: new Parameter(name: 'name', in: 'query', description: 'From user openApi'))], @@ -1635,7 +1635,7 @@ public function testFilterlessArrayQueryParameterHonoursCastToArray(): void $resourceCollectionMetadataFactory = $this->createMock(ResourceMetadataCollectionFactoryInterface::class); $propertyNameCollectionFactory = $this->createMock(PropertyNameCollectionFactoryInterface::class); $propertyMetadataFactory = $this->createMock(PropertyMetadataFactoryInterface::class); - $definitionNameFactory = new DefinitionNameFactory([]); + $definitionNameFactory = new DefinitionNameFactory(); $arraySchema = ['type' => 'array', 'items' => ['type' => 'string']]; @@ -1757,7 +1757,7 @@ public function testDeleteOperationWithDeserializeDocumentsRequestBody(): void $resourceCollectionMetadataFactory = $this->createMock(ResourceMetadataCollectionFactoryInterface::class); $propertyNameCollectionFactory = $this->createMock(PropertyNameCollectionFactoryInterface::class); $propertyMetadataFactory = $this->createMock(PropertyMetadataFactoryInterface::class); - $definitionNameFactory = new DefinitionNameFactory([]); + $definitionNameFactory = new DefinitionNameFactory(); $resourceCollectionMetadata = new ResourceMetadataCollection(Dummy::class, [(new ApiResource(operations: [ 'deleteWithBody' => (new Delete()) diff --git a/src/Symfony/Tests/Doctrine/EventListener/PurgeHttpCacheListenerTest.php b/src/Symfony/Tests/Doctrine/EventListener/PurgeHttpCacheListenerTest.php index a78eda245f..8a2c7910b7 100644 --- a/src/Symfony/Tests/Doctrine/EventListener/PurgeHttpCacheListenerTest.php +++ b/src/Symfony/Tests/Doctrine/EventListener/PurgeHttpCacheListenerTest.php @@ -366,10 +366,10 @@ static function (object $resource, int $referenceType = UrlGeneratorInterface::A $resourceClassResolver->method('isResourceClass')->willReturn(true); $resourceMetadataCollectionFactory = $this->createMock(ResourceMetadataCollectionFactoryInterface::class); - $resourceMetadataCollectionFactory->method('create')->with(Dummy::class)->willReturn($resourceMetadataCollection); + $resourceMetadataCollectionFactory->expects($this->atLeastOnce())->method('create')->with(Dummy::class)->willReturn($resourceMetadataCollection); $em = $this->createMock(EntityManagerInterface::class); - $em->method('getClassMetadata')->with(Dummy::class)->willReturn(new ClassMetadata(Dummy::class)); + $em->expects($this->atLeastOnce())->method('getClassMetadata')->with(Dummy::class)->willReturn(new ClassMetadata(Dummy::class)); $changeSet = []; $eventArgs = new PreUpdateEventArgs($dummy, $em, $changeSet); @@ -416,10 +416,10 @@ static function (object $resource, int $referenceType = UrlGeneratorInterface::A $resourceClassResolver->method('isResourceClass')->willReturn(true); $resourceMetadataCollectionFactory = $this->createMock(ResourceMetadataCollectionFactoryInterface::class); - $resourceMetadataCollectionFactory->method('create')->with(Dummy::class)->willReturn($resourceMetadataCollection); + $resourceMetadataCollectionFactory->expects($this->atLeastOnce())->method('create')->with(Dummy::class)->willReturn($resourceMetadataCollection); $em = $this->createMock(EntityManagerInterface::class); - $em->method('getClassMetadata')->with(Dummy::class)->willReturn(new ClassMetadata(Dummy::class)); + $em->expects($this->atLeastOnce())->method('getClassMetadata')->with(Dummy::class)->willReturn(new ClassMetadata(Dummy::class)); $changeSet = []; $eventArgs = new PreUpdateEventArgs($dummy, $em, $changeSet); From 30df85022b5d2f204b1ac86efaf0cf3d6bbdf77b Mon Sep 17 00:00:00 2001 From: soyuka Date: Wed, 30 Sep 2026 14:58:06 +0200 Subject: [PATCH 2/2] test: use ApiPlatform\Test\ApiTestCase in functional tests --- tests/Functional/DecoratedItemNormalizerDenormalizationTest.php | 2 +- tests/Functional/GraphQl/CustomQueryArgDerivedTypeTest.php | 2 +- .../JsonApi/SparseFieldsetParameterProviderIncludeTest.php | 2 +- .../JsonLd/OperationShortNameWithoutApiResourceTest.php | 2 +- .../JsonSchema/DefinitionNameValidationContextTest.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/Functional/DecoratedItemNormalizerDenormalizationTest.php b/tests/Functional/DecoratedItemNormalizerDenormalizationTest.php index 755f3b20c0..e76fd33164 100644 --- a/tests/Functional/DecoratedItemNormalizerDenormalizationTest.php +++ b/tests/Functional/DecoratedItemNormalizerDenormalizationTest.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Tests\Functional; -use ApiPlatform\Symfony\Bundle\Test\ApiTestCase; +use ApiPlatform\Test\ApiTestCase; use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\ValidateOnce; use ApiPlatform\Tests\Fixtures\TestBundle\Serializer\Decorator\DenormalizingJsonLdItemNormalizerDecorator; use ApiPlatform\Tests\SetupClassResourcesTrait; diff --git a/tests/Functional/GraphQl/CustomQueryArgDerivedTypeTest.php b/tests/Functional/GraphQl/CustomQueryArgDerivedTypeTest.php index aa1e5b7179..b3e922cbd5 100644 --- a/tests/Functional/GraphQl/CustomQueryArgDerivedTypeTest.php +++ b/tests/Functional/GraphQl/CustomQueryArgDerivedTypeTest.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Tests\Functional\GraphQl; -use ApiPlatform\Symfony\Bundle\Test\ApiTestCase; +use ApiPlatform\Test\ApiTestCase; use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\Issue8473\Widget; use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\Issue8473\WidgetStatusOptions; use ApiPlatform\Tests\SetupClassResourcesTrait; diff --git a/tests/Functional/JsonApi/SparseFieldsetParameterProviderIncludeTest.php b/tests/Functional/JsonApi/SparseFieldsetParameterProviderIncludeTest.php index 554cb7f298..c349038432 100644 --- a/tests/Functional/JsonApi/SparseFieldsetParameterProviderIncludeTest.php +++ b/tests/Functional/JsonApi/SparseFieldsetParameterProviderIncludeTest.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Tests\Functional\JsonApi; -use ApiPlatform\Symfony\Bundle\Test\ApiTestCase; +use ApiPlatform\Test\ApiTestCase; use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\JsonApi\SparseFieldsetIncludeArticle; use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\JsonApi\SparseFieldsetIncludeAuthor; use ApiPlatform\Tests\SetupClassResourcesTrait; diff --git a/tests/Functional/JsonLd/OperationShortNameWithoutApiResourceTest.php b/tests/Functional/JsonLd/OperationShortNameWithoutApiResourceTest.php index 8a6efc4f1e..24d0af1505 100644 --- a/tests/Functional/JsonLd/OperationShortNameWithoutApiResourceTest.php +++ b/tests/Functional/JsonLd/OperationShortNameWithoutApiResourceTest.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Tests\Functional\JsonLd; -use ApiPlatform\Symfony\Bundle\Test\ApiTestCase; +use ApiPlatform\Test\ApiTestCase; use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\OperationShortNameWithoutApiResource\CollectionFirstShortNamesResource; use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\OperationShortNameWithoutApiResource\MultipleOperationShortNamesResource; use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\OperationShortNameWithoutApiResource\OperationShortNameResource; diff --git a/tests/Functional/JsonSchema/DefinitionNameValidationContextTest.php b/tests/Functional/JsonSchema/DefinitionNameValidationContextTest.php index 1a8b6a3738..f546adfa2b 100644 --- a/tests/Functional/JsonSchema/DefinitionNameValidationContextTest.php +++ b/tests/Functional/JsonSchema/DefinitionNameValidationContextTest.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Tests\Functional\JsonSchema; -use ApiPlatform\Symfony\Bundle\Test\ApiTestCase; +use ApiPlatform\Test\ApiTestCase; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyValidation; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyValidationReversedOrder; use ApiPlatform\Tests\SetupClassResourcesTrait;