fix: different context uses same model (#2183)

* fix: different context uses same model * style fix * fix model registry test
nelmio · Jan 6, 2024 · 31da761 · 31da761
1 parent 01b75ce
commit 31da761
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 4 deletions.
diff --git a/Model/Model.php b/Model/Model.php
@@ -59,7 +59,7 @@ public function getSerializationContext(): array
 
     public function getHash(): string
     {
-        return md5(serialize([$this->type, $this->getGroups()]));
+        return md5(serialize([$this->type, $this->getSerializationContext()]));
     }
 
     /**

diff --git a/Model/ModelRegistry.php b/Model/ModelRegistry.php
@@ -157,6 +157,7 @@ private function modelToArray(Model $model): array
             'type' => $getType($model->getType()),
             'options' => $model->getOptions(),
             'groups' => $model->getGroups(),
+            'serialization_context' => $model->getSerializationContext(),
         ];
     }
 

diff --git a/Tests/Functional/Controller/ApiController80.php b/Tests/Functional/Controller/ApiController80.php
@@ -479,6 +479,13 @@ public function serializedNameAction()
      *
      *    @Model(type=EntityThroughNameConverter::class, serializationContext={"secret_name_converter_value"=true})
      * )
+     *
+     * @OA\Response(
+     *     response="201",
+     *     description="Same class without context",
+     *
+     *     @Model(type=EntityThroughNameConverter::class)
+     *  )
      */
     public function nameConverterContext()
     {

diff --git a/Tests/Functional/Controller/ApiController81.php b/Tests/Functional/Controller/ApiController81.php
@@ -426,7 +426,16 @@ public function serializedNameAction()
     }
 
     #[Route('/name_converter_context', methods: ['GET'])]
-    #[OA\Response(response: '200', description: '', content: new Model(type: EntityThroughNameConverter::class, serializationContext: ['secret_name_converter_value' => true]))]
+    #[OA\Response(
+        response: '200',
+        description: '',
+        content: new Model(type: EntityThroughNameConverter::class, serializationContext: ['secret_name_converter_value' => true])
+    )]
+    #[OA\Response(
+        response: '201',
+        description: 'Same class without context',
+        content: new Model(type: EntityThroughNameConverter::class)
+    )]
     public function nameConverterContext()
     {
     }

diff --git a/Tests/Functional/FunctionalTest.php b/Tests/Functional/FunctionalTest.php
@@ -848,13 +848,42 @@ public function testEntityWithNullableSchemaSet()
 
     public function testContextPassedToNameConverter()
     {
-        $this->getOperation('/api/name_converter_context', 'get');
+        $operation = $this->getOperation('/api/name_converter_context', 'get');
+
+        $response = $this->getOperationResponse($operation, '200');
+        self::assertEquals([
+            'response' => '200',
+            'description' => '',
+            'content' => [
+                'application/json' => [
+                    'schema' => ['$ref' => '#/components/schemas/EntityThroughNameConverter'],
+                ],
+            ],
+        ], json_decode($response->toJson(), true));
 
         $model = $this->getModel('EntityThroughNameConverter');
         $this->assertCount(2, $model->properties);
         $this->assertNotHasProperty('id', $model);
         $this->assertHasProperty('name_converter_context_id', $model);
         $this->assertNotHasProperty('name', $model);
         $this->assertHasProperty('name_converter_context_name', $model);
+
+        $response = $this->getOperationResponse($operation, '201');
+        self::assertEquals([
+            'response' => '201',
+            'description' => 'Same class without context',
+            'content' => [
+                'application/json' => [
+                    'schema' => ['$ref' => '#/components/schemas/EntityThroughNameConverter2'],
+                ],
+            ],
+        ], json_decode($response->toJson(), true));
+
+        $model = $this->getModel('EntityThroughNameConverter2');
+        $this->assertCount(2, $model->properties);
+        $this->assertNotHasProperty('name_converter_context_id', $model);
+        $this->assertHasProperty('id', $model);
+        $this->assertNotHasProperty('name_converter_context_name', $model);
+        $this->assertHasProperty('name', $model);
     }
 }
diff --git a/Tests/Model/ModelRegistryTest.php b/Tests/Model/ModelRegistryTest.php
@@ -51,18 +51,25 @@ public function testNameCollisionsAreLogged(Type $type, array $arrayType)
                     'type' => $arrayType,
                     'options' => null,
                     'groups' => ['group2'],
+                    'serialization_context' => [
+                        'groups' => ['group2'],
+                    ],
                 ],
                 'taken_by' => [
                     'type' => $arrayType,
                     'options' => null,
                     'groups' => ['group1'],
+                    'serialization_context' => [
+                        'groups' => ['group1'],
+                        'extra_context' => true,
+                    ],
                 ],
             ]);
 
         $registry = new ModelRegistry([], $this->createOpenApi(), []);
         $registry->setLogger($logger);
 
-        $registry->register(new Model($type, ['group1']));
+        $registry->register(new Model($type, ['group1'], null, ['extra_context' => true]));
         $registry->register(new Model($type, ['group2']));
     }
 
@@ -128,6 +135,7 @@ public function testNameCollisionsAreLoggedWithAlternativeNames()
                     ],
                     'options' => null,
                     'groups' => ['group2'],
+                    'serialization_context' => ['groups' => ['group2']],
                 ],
                 'taken_by' => [
                     'type' => [
@@ -140,6 +148,7 @@ public function testNameCollisionsAreLoggedWithAlternativeNames()
                     ],
                     'options' => null,
                     'groups' => ['group1'],
+                    'serialization_context' => ['groups' => ['group1']],
                 ],
             ]);