Skip to content

Commit 01673aa

Browse files
committed
Merge 3.1 into 3.2
2 parents 66ae7a2 + 3685010 commit 01673aa

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/JsonApi/Serializer/ConstraintViolationListNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
use Symfony\Component\Validator\ConstraintViolationListInterface;
2323

2424
/**
25-
* Converts {@see \Symfony\Component\Validator\ConstraintViolationListInterface} to a JSON API error representation.
25+
* Converts {@see ConstraintViolationListInterface} to a JSON API error representation.
2626
*
2727
* @author Héctor Hurtarte <[email protected]>
2828
*/

src/Metadata/Resource/Factory/NotExposedOperationResourceMetadataCollectionFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function create(string $resourceClass): ResourceMetadataCollection
6060
foreach ($resourceMetadataCollection as $resource) {
6161
$operations = $resource->getOperations();
6262

63-
/** @var \ApiPlatform\Metadata\HttpOperation $operation */
63+
/** @var HttpOperation $operation */
6464
foreach ($operations as $operation) {
6565
// An item operation has been found, nothing to do anymore in this factory
6666
if (('GET' === $operation->getMethod() && !$operation instanceof CollectionOperationInterface) || ($operation->getExtraProperties()['is_legacy_resource_metadata'] ?? false)) {

tests/Behat/DoctrineContext.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2213,7 +2213,7 @@ public function thereIsADummyWithSubEntity(string $strId, string $name): void
22132213
public function thereIsAGroupWithUuidAndNUsers(string $uuid, int $nbUsers): void
22142214
{
22152215
$group = new Group();
2216-
$group->setUuid(\Symfony\Component\Uid\Uuid::fromString($uuid));
2216+
$group->setUuid(SymfonyUuid::fromString($uuid));
22172217

22182218
$this->manager->persist($group);
22192219

0 commit comments

Comments
 (0)