Merge branch '4.1' into main

Resolve merge conflict in tests/Functional/ValidationTest.php by combining test cases.

Author: soyuka

SchemaFactory.php

@@ -246,7 +246,11 @@ private function buildLegacyPropertySchema(Schema $schema, string $definitionNam
                 $subDefinitionName = $this->definitionNameFactory->create($className, $format, $className, null, $serializerContext);
 
                 if (isset($subSchema->getDefinitions()[$subDefinitionName])) {
-                    unset($subSchema->getDefinitions()[$subDefinitionName]['properties']['@id']);
+                    // @see https://github.com/api-platform/core/issues/7162
+                    // Need to rebuild the definition without @id property and set it back to the sub-schema
+                    $subSchemaDefinition = $subSchema->getDefinitions()[$subDefinitionName]->getArrayCopy();
+                    unset($subSchemaDefinition['properties']['@id']);
+                    $subSchema->getDefinitions()[$subDefinitionName] = new \ArrayObject($subSchemaDefinition);
                 }
             }