fix(doctrine): use stateOptions only within doctrine context (#5726)

api-platform · Aug 8, 2023 · 7bb92a5 · 7bb92a5
1 parent 78a4966
commit 7bb92a5
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 29 deletions.
diff --git a/features/doctrine/separated_resource.feature b/features/doctrine/separated_resource.feature
@@ -5,7 +5,7 @@ Feature: Use state options to use an entity that is not a resource
 
   @!mongodb
   @createSchema
-  Scenario: Get collection 
+  Scenario: Get collection
     Given there are 5 separated entities
     When I send a "GET" request to "/separated_entities"
     Then the response status code should be 200
@@ -35,7 +35,7 @@ Feature: Use state options to use an entity that is not a resource
 
   @!mongodb
   @createSchema
-  Scenario: Get ordered collection 
+  Scenario: Get ordered collection
     Given there are 5 separated entities
     When I send a "GET" request to "/separated_entities?order[value]=desc"
     Then the response status code should be 200
@@ -45,10 +45,32 @@ Feature: Use state options to use an entity that is not a resource
 
   @!mongodb
   @createSchema
-  Scenario: Get item 
+  Scenario: Get item
     Given there are 5 separated entities
     When I send a "GET" request to "/separated_entities/1"
-    Then print last JSON response
     Then the response status code should be 200
     And the response should be in JSON
     And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
+
+  @!mongodb
+  @createSchema
+  Scenario: Get item
+    Given there are 5 separated entities
+    When I send a "GET" request to "/separated_entities/1"
+    Then the response status code should be 200
+    And the response should be in JSON
+    And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
+
+  @!mongodb
+  @createSchema
+  Scenario: Get all EntityClassAndCustomProviderResources
+    Given there are 1 separated entities
+    When I send a "GET" request to "/entityClassAndCustomProviderResources"
+    Then the response status code should be 200
+
+  @!mongodb
+  @createSchema
+  Scenario: Get one EntityClassAndCustomProviderResource
+    Given there are 1 separated entities
+    When I send a "GET" request to "/entityClassAndCustomProviderResources/1"
+    Then the response status code should be 200
diff --git a/features/main/crud_uri_variables.feature b/features/main/crud_uri_variables.feature
@@ -200,15 +200,3 @@ Feature: Uri Variables
     When I add "Content-Type" header equal to "application/ld+json"
     And I send a "GET" request to "/companies/1/employees/2"
     Then the response status code should be 404
-
-  @!mongodb
-  Scenario: Get all EntityClassAndCustomProviderResources
-    Given there are 1 separated entities
-    When I send a "GET" request to "/entityClassAndCustomProviderResources"
-    Then the response status code should be 200
-
-  @!mongodb
-  Scenario: Get one EntityClassAndCustomProviderResource
-    Given there are 1 separated entities
-    When I send a "GET" request to "/entityClassAndCustomProviderResources/1"
-    Then the response status code should be 200
diff --git a/src/Metadata/Resource/Factory/LinkFactory.php b/src/Metadata/Resource/Factory/LinkFactory.php
@@ -13,7 +13,6 @@
 
 namespace ApiPlatform\Metadata\Resource\Factory;
 
-use ApiPlatform\Doctrine\Orm\State\Options;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Exception\RuntimeException;
 use ApiPlatform\Metadata\Link;
@@ -59,12 +58,7 @@ public function createLinksFromIdentifiers(ApiResource|Operation $operation): ar
             return [];
         }
 
-        $entityClass = $resourceClass;
-        if (($options = $operation->getStateOptions()) && $options instanceof Options && $options->getEntityClass()) {
-            $entityClass = $options->getEntityClass();
-        }
-
-        $link = (new Link())->withFromClass($entityClass)->withIdentifiers($identifiers);
+        $link = (new Link())->withFromClass($resourceClass)->withIdentifiers($identifiers);
         $parameterName = $identifiers[0];
 
         if (1 < \count($identifiers)) {

diff --git a/tests/Fixtures/TestBundle/ApiResource/EntityClassAndCustomProviderResource.php b/tests/Fixtures/TestBundle/ApiResource/EntityClassAndCustomProviderResource.php
@@ -14,7 +14,6 @@
 namespace ApiPlatform\Tests\Fixtures\TestBundle\ApiResource;
 
 use ApiPlatform\Doctrine\Orm\State\Options;
-use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
@@ -25,7 +24,6 @@
     operations: [
         new Get(
             uriTemplate: '/entityClassAndCustomProviderResources/{id}',
-            uriVariables: ['id']
         ),
         new GetCollection(
             uriTemplate: '/entityClassAndCustomProviderResources'
@@ -36,8 +34,6 @@
 )]
 class EntityClassAndCustomProviderResource
 {
-    #[ApiProperty(identifier: true)]
     public ?int $id;
-
     public ?string $value;
 }
diff --git a/tests/Fixtures/TestBundle/State/EntityClassAndCustomProviderResourceProvider.php b/tests/Fixtures/TestBundle/State/EntityClassAndCustomProviderResourceProvider.php
@@ -15,7 +15,6 @@
 
 use ApiPlatform\Doctrine\Orm\State\CollectionProvider;
 use ApiPlatform\Doctrine\Orm\State\ItemProvider;
-use ApiPlatform\Doctrine\Orm\State\Options;
 use ApiPlatform\Exception\ItemNotFoundException;
 use ApiPlatform\Metadata\CollectionOperationInterface;
 use ApiPlatform\Metadata\Operation;
@@ -39,7 +38,6 @@ public function __construct(
      */
     public function provide(Operation $operation, array $uriVariables = [], array $context = []): object|array|null
     {
-        $operation = ($stateOptions = $operation->getStateOptions()) instanceof Options ? $operation->withClass($stateOptions->getEntityClass()) : $operation;
         if ($operation instanceof CollectionOperationInterface) {
             $data = $this->collectionProvider->provide(
                 $operation,