Merge 3.1 into 3.2

api-platform · Dec 29, 2023 · 01673aa · 01673aa
2 parents 66ae7a2 + 3685010
commit 01673aa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/JsonApi/Serializer/ConstraintViolationListNormalizer.php b/src/JsonApi/Serializer/ConstraintViolationListNormalizer.php
@@ -22,7 +22,7 @@
 use Symfony\Component\Validator\ConstraintViolationListInterface;
 
 /**
- * Converts {@see \Symfony\Component\Validator\ConstraintViolationListInterface} to a JSON API error representation.
+ * Converts {@see ConstraintViolationListInterface} to a JSON API error representation.
  *
  * @author Héctor Hurtarte <[email protected]>
  */

diff --git a/src/Metadata/Resource/Factory/NotExposedOperationResourceMetadataCollectionFactory.php b/src/Metadata/Resource/Factory/NotExposedOperationResourceMetadataCollectionFactory.php
@@ -60,7 +60,7 @@ public function create(string $resourceClass): ResourceMetadataCollection
         foreach ($resourceMetadataCollection as $resource) {
             $operations = $resource->getOperations();
 
-            /** @var \ApiPlatform\Metadata\HttpOperation $operation */
+            /** @var HttpOperation $operation */
             foreach ($operations as $operation) {
                 // An item operation has been found, nothing to do anymore in this factory
                 if (('GET' === $operation->getMethod() && !$operation instanceof CollectionOperationInterface) || ($operation->getExtraProperties()['is_legacy_resource_metadata'] ?? false)) {

diff --git a/tests/Behat/DoctrineContext.php b/tests/Behat/DoctrineContext.php
@@ -2213,7 +2213,7 @@ public function thereIsADummyWithSubEntity(string $strId, string $name): void
     public function thereIsAGroupWithUuidAndNUsers(string $uuid, int $nbUsers): void
     {
         $group = new Group();
-        $group->setUuid(\Symfony\Component\Uid\Uuid::fromString($uuid));
+        $group->setUuid(SymfonyUuid::fromString($uuid));
 
         $this->manager->persist($group);