Skip to content

Commit

Permalink
Merge branch '6.3' into 6.4
Browse files Browse the repository at this point in the history
* 6.3:
  Fix merge (bis)
  Fix merge
  • Loading branch information
nicolas-grekas committed Jan 29, 2024
2 parents 566a1e0 + 95767d5 commit 3f730a6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Tests/Normalizer/AbstractObjectNormalizerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,7 @@ protected function extractAttributes(object $object, string $format = null, arra
return array_keys((array) $object);
}

protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = [])
protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []): mixed
{
return $object->{$attribute};
}
Expand Down Expand Up @@ -971,7 +971,7 @@ protected function extractAttributes(object $object, string $format = null, arra
return array_keys((array) $object);
}

protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = [])
protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []): mixed
{
return $object->{$attribute};
}
Expand Down Expand Up @@ -1006,7 +1006,7 @@ protected function extractAttributes(object $object, string $format = null, arra
return array_keys((array) $object);
}

protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = [])
protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []): mixed
{
return $object->{$attribute};
}
Expand Down

0 comments on commit 3f730a6

Please sign in to comment.