diff options
35 files changed, 36 insertions, 48 deletions
diff --git a/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php b/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php index 2ed0a8fb4a9..de62934f673 100644 --- a/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php +++ b/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php @@ -66,7 +66,7 @@ class ContentEntityNormalizer extends NormalizerBase { /** * {@inheritdoc} */ - public function normalize($entity, $format = NULL, array $context = []) { + public function normalize($entity, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { $context += [ 'account' => NULL, 'included_fields' => NULL, diff --git a/core/modules/hal/src/Normalizer/EntityReferenceItemNormalizer.php b/core/modules/hal/src/Normalizer/EntityReferenceItemNormalizer.php index d078cf154a7..6bd2d5226ce 100644 --- a/core/modules/hal/src/Normalizer/EntityReferenceItemNormalizer.php +++ b/core/modules/hal/src/Normalizer/EntityReferenceItemNormalizer.php @@ -63,7 +63,7 @@ class EntityReferenceItemNormalizer extends FieldItemNormalizer implements UuidR /** * {@inheritdoc} */ - public function normalize($field_item, $format = NULL, array $context = []) { + public function normalize($field_item, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { // If this is not a fieldable entity, let the parent implementation handle // it, only fieldable entities are supported as embedded resources. if (!$this->targetEntityIsFieldable($field_item)) { diff --git a/core/modules/hal/src/Normalizer/FieldItemNormalizer.php b/core/modules/hal/src/Normalizer/FieldItemNormalizer.php index f4d8447ee19..50b6466d41f 100644 --- a/core/modules/hal/src/Normalizer/FieldItemNormalizer.php +++ b/core/modules/hal/src/Normalizer/FieldItemNormalizer.php @@ -24,7 +24,7 @@ class FieldItemNormalizer extends NormalizerBase { /** * {@inheritdoc} */ - public function normalize($field_item, $format = NULL, array $context = []) { + public function normalize($field_item, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { // The values are wrapped in an array, and then wrapped in another array // keyed by field name so that field items can be merged by the // FieldNormalizer. This is necessary for the EntityReferenceItemNormalizer diff --git a/core/modules/hal/src/Normalizer/FieldNormalizer.php b/core/modules/hal/src/Normalizer/FieldNormalizer.php index 1ac987c1ef4..75af3011fdb 100644 --- a/core/modules/hal/src/Normalizer/FieldNormalizer.php +++ b/core/modules/hal/src/Normalizer/FieldNormalizer.php @@ -18,7 +18,7 @@ class FieldNormalizer extends SerializationFieldNormalizer { /** * {@inheritdoc} */ - public function normalize($field_items, $format = NULL, array $context = []) { + public function normalize($field_items, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { $normalized_field_items = []; // Get the field definition. diff --git a/core/modules/jsonapi/src/Normalizer/DataNormalizer.php b/core/modules/jsonapi/src/Normalizer/DataNormalizer.php index e109dd32c52..f022f9fe70c 100644 --- a/core/modules/jsonapi/src/Normalizer/DataNormalizer.php +++ b/core/modules/jsonapi/src/Normalizer/DataNormalizer.php @@ -20,7 +20,7 @@ class DataNormalizer extends NormalizerBase { /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { assert($object instanceof Data); $cacheable_normalizations = array_map(function ($resource) use ($format, $context) { return $this->serializer->normalize($resource, $format, $context); diff --git a/core/modules/jsonapi/src/Normalizer/EntityDenormalizerBase.php b/core/modules/jsonapi/src/Normalizer/EntityDenormalizerBase.php index a5715dedae7..fcbfc197c47 100644 --- a/core/modules/jsonapi/src/Normalizer/EntityDenormalizerBase.php +++ b/core/modules/jsonapi/src/Normalizer/EntityDenormalizerBase.php @@ -74,7 +74,7 @@ abstract class EntityDenormalizerBase extends NormalizerBase implements Denormal /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { throw new \LogicException('This method should never be called.'); } diff --git a/core/modules/jsonapi/src/Normalizer/EntityReferenceFieldNormalizer.php b/core/modules/jsonapi/src/Normalizer/EntityReferenceFieldNormalizer.php index de46d4d3696..8472c1dacff 100644 --- a/core/modules/jsonapi/src/Normalizer/EntityReferenceFieldNormalizer.php +++ b/core/modules/jsonapi/src/Normalizer/EntityReferenceFieldNormalizer.php @@ -32,7 +32,7 @@ class EntityReferenceFieldNormalizer extends FieldNormalizer { /** * {@inheritdoc} */ - public function normalize($field, $format = NULL, array $context = []) { + public function normalize($field, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { assert($field instanceof EntityReferenceFieldItemListInterface); // Build the relationship object based on the Entity Reference and normalize // that object instead. diff --git a/core/modules/jsonapi/src/Normalizer/FieldItemNormalizer.php b/core/modules/jsonapi/src/Normalizer/FieldItemNormalizer.php index 7a26ebe6281..4fb2281b6a5 100644 --- a/core/modules/jsonapi/src/Normalizer/FieldItemNormalizer.php +++ b/core/modules/jsonapi/src/Normalizer/FieldItemNormalizer.php @@ -59,7 +59,7 @@ class FieldItemNormalizer extends NormalizerBase implements DenormalizerInterfac * cacheability in mind, and hence bubbles cacheability out of band. This must * catch it, and pass it to the value object that JSON:API uses. */ - public function normalize($field_item, $format = NULL, array $context = []) { + public function normalize($field_item, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { assert($field_item instanceof FieldItemInterface); /** @var \Drupal\Core\TypedData\TypedDataInterface $property */ $values = []; diff --git a/core/modules/jsonapi/src/Normalizer/FieldNormalizer.php b/core/modules/jsonapi/src/Normalizer/FieldNormalizer.php index eaa1d56ecf5..c78f41d6e71 100644 --- a/core/modules/jsonapi/src/Normalizer/FieldNormalizer.php +++ b/core/modules/jsonapi/src/Normalizer/FieldNormalizer.php @@ -30,7 +30,7 @@ class FieldNormalizer extends NormalizerBase implements DenormalizerInterface { /** * {@inheritdoc} */ - public function normalize($field, $format = NULL, array $context = []) { + public function normalize($field, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { /** @var \Drupal\Core\Field\FieldItemListInterface $field */ $normalized_items = $this->normalizeFieldItems($field, $format, $context); assert($context['resource_object'] instanceof ResourceObject); diff --git a/core/modules/jsonapi/src/Normalizer/HttpExceptionNormalizer.php b/core/modules/jsonapi/src/Normalizer/HttpExceptionNormalizer.php index 0b91b4d92f3..22f57b11678 100644 --- a/core/modules/jsonapi/src/Normalizer/HttpExceptionNormalizer.php +++ b/core/modules/jsonapi/src/Normalizer/HttpExceptionNormalizer.php @@ -48,7 +48,7 @@ class HttpExceptionNormalizer extends NormalizerBase { /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { $cacheability = new CacheableMetadata(); $cacheability->addCacheableDependency($object); return new HttpExceptionNormalizerValue($cacheability, static::rasterizeValueRecursive($this->buildErrorObjects($object))); diff --git a/core/modules/jsonapi/src/Normalizer/JsonApiDocumentTopLevelNormalizer.php b/core/modules/jsonapi/src/Normalizer/JsonApiDocumentTopLevelNormalizer.php index 0c9d45fca20..d895a22758c 100644 --- a/core/modules/jsonapi/src/Normalizer/JsonApiDocumentTopLevelNormalizer.php +++ b/core/modules/jsonapi/src/Normalizer/JsonApiDocumentTopLevelNormalizer.php @@ -172,7 +172,7 @@ class JsonApiDocumentTopLevelNormalizer extends NormalizerBase implements Denorm /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { assert($object instanceof JsonApiDocumentTopLevel); $data = $object->getData(); $document['jsonapi'] = CacheableNormalization::permanent([ diff --git a/core/modules/jsonapi/src/Normalizer/LinkCollectionNormalizer.php b/core/modules/jsonapi/src/Normalizer/LinkCollectionNormalizer.php index 0e95e41d5bc..f5a1383f249 100644 --- a/core/modules/jsonapi/src/Normalizer/LinkCollectionNormalizer.php +++ b/core/modules/jsonapi/src/Normalizer/LinkCollectionNormalizer.php @@ -90,7 +90,7 @@ class LinkCollectionNormalizer extends NormalizerBase { /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { assert($object instanceof LinkCollection); $normalized = []; /** @var \Drupal\jsonapi\JsonApiResource\Link $link */ diff --git a/core/modules/jsonapi/src/Normalizer/RelationshipNormalizer.php b/core/modules/jsonapi/src/Normalizer/RelationshipNormalizer.php index 53354af0b6a..e7802e787d8 100644 --- a/core/modules/jsonapi/src/Normalizer/RelationshipNormalizer.php +++ b/core/modules/jsonapi/src/Normalizer/RelationshipNormalizer.php @@ -20,7 +20,7 @@ class RelationshipNormalizer extends NormalizerBase { /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { assert($object instanceof Relationship); return CacheableNormalization::aggregate([ 'data' => $this->serializer->normalize($object->getData(), $format, $context), diff --git a/core/modules/jsonapi/src/Normalizer/ResourceIdentifierNormalizer.php b/core/modules/jsonapi/src/Normalizer/ResourceIdentifierNormalizer.php index 2b9837ae0d3..10ab8546ab2 100644 --- a/core/modules/jsonapi/src/Normalizer/ResourceIdentifierNormalizer.php +++ b/core/modules/jsonapi/src/Normalizer/ResourceIdentifierNormalizer.php @@ -48,7 +48,7 @@ class ResourceIdentifierNormalizer extends NormalizerBase implements Denormalize /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { assert($object instanceof ResourceIdentifier); $normalization = [ 'type' => $object->getTypeName(), diff --git a/core/modules/jsonapi/src/Normalizer/ResourceObjectNormalizer.php b/core/modules/jsonapi/src/Normalizer/ResourceObjectNormalizer.php index a79eb95b541..9c14c55d34d 100644 --- a/core/modules/jsonapi/src/Normalizer/ResourceObjectNormalizer.php +++ b/core/modules/jsonapi/src/Normalizer/ResourceObjectNormalizer.php @@ -54,7 +54,7 @@ class ResourceObjectNormalizer extends NormalizerBase { /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { assert($object instanceof ResourceObject); // If the fields to use were specified, only output those field values. $context['resource_object'] = $object; diff --git a/core/modules/jsonapi/src/Serializer/Serializer.php b/core/modules/jsonapi/src/Serializer/Serializer.php index 745fa30465a..55f66ac3da8 100644 --- a/core/modules/jsonapi/src/Serializer/Serializer.php +++ b/core/modules/jsonapi/src/Serializer/Serializer.php @@ -57,7 +57,7 @@ final class Serializer extends SymfonySerializer { /** * {@inheritdoc} */ - public function normalize($data, $format = NULL, array $context = []) { + public function normalize($data, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { if ($this->selfSupportsNormalization($data, $format, $context)) { return parent::normalize($data, $format, $context); } diff --git a/core/modules/jsonapi/tests/modules/jsonapi_test_data_type/src/Normalizer/StringNormalizer.php b/core/modules/jsonapi/tests/modules/jsonapi_test_data_type/src/Normalizer/StringNormalizer.php index 7ceddc26346..1f4220919da 100644 --- a/core/modules/jsonapi/tests/modules/jsonapi_test_data_type/src/Normalizer/StringNormalizer.php +++ b/core/modules/jsonapi/tests/modules/jsonapi_test_data_type/src/Normalizer/StringNormalizer.php @@ -19,7 +19,7 @@ class StringNormalizer extends NormalizerBase implements DenormalizerInterface { /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { return str_replace('super', 'NOT', $object->getValue()); } diff --git a/core/modules/jsonapi/tests/modules/jsonapi_test_data_type/src/Normalizer/TraversableObjectNormalizer.php b/core/modules/jsonapi/tests/modules/jsonapi_test_data_type/src/Normalizer/TraversableObjectNormalizer.php index 89e5967134b..84697694f29 100644 --- a/core/modules/jsonapi/tests/modules/jsonapi_test_data_type/src/Normalizer/TraversableObjectNormalizer.php +++ b/core/modules/jsonapi/tests/modules/jsonapi_test_data_type/src/Normalizer/TraversableObjectNormalizer.php @@ -18,7 +18,7 @@ class TraversableObjectNormalizer extends NormalizerBase { /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { return $object->property; } diff --git a/core/modules/jsonapi/tests/modules/jsonapi_test_field_type/src/Normalizer/StringNormalizer.php b/core/modules/jsonapi/tests/modules/jsonapi_test_field_type/src/Normalizer/StringNormalizer.php index 2f3f70e0efe..1c6f306a4e5 100644 --- a/core/modules/jsonapi/tests/modules/jsonapi_test_field_type/src/Normalizer/StringNormalizer.php +++ b/core/modules/jsonapi/tests/modules/jsonapi_test_field_type/src/Normalizer/StringNormalizer.php @@ -19,7 +19,7 @@ class StringNormalizer extends FieldItemNormalizer implements DenormalizerInterf /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { $data = parent::normalize($object, $format, $context); $data['value'] = str_replace('super', 'NOT', $data['value']); return $data; diff --git a/core/modules/serialization/src/Normalizer/ComplexDataNormalizer.php b/core/modules/serialization/src/Normalizer/ComplexDataNormalizer.php index f8f4c308d0d..1c700f222f3 100644 --- a/core/modules/serialization/src/Normalizer/ComplexDataNormalizer.php +++ b/core/modules/serialization/src/Normalizer/ComplexDataNormalizer.php @@ -25,7 +25,7 @@ class ComplexDataNormalizer extends NormalizerBase { /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { $attributes = []; // $object will not always match $supportedInterfaceOrClass. // @see \Drupal\serialization\Normalizer\EntityNormalizer diff --git a/core/modules/serialization/src/Normalizer/ConfigEntityNormalizer.php b/core/modules/serialization/src/Normalizer/ConfigEntityNormalizer.php index a5d1e4f4915..b4ca7ff7d76 100644 --- a/core/modules/serialization/src/Normalizer/ConfigEntityNormalizer.php +++ b/core/modules/serialization/src/Normalizer/ConfigEntityNormalizer.php @@ -17,7 +17,7 @@ class ConfigEntityNormalizer extends EntityNormalizer { /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { return static::getDataWithoutInternals($object->toArray()); } diff --git a/core/modules/serialization/src/Normalizer/ContentEntityNormalizer.php b/core/modules/serialization/src/Normalizer/ContentEntityNormalizer.php index 0282ef2d517..9e4b819622b 100644 --- a/core/modules/serialization/src/Normalizer/ContentEntityNormalizer.php +++ b/core/modules/serialization/src/Normalizer/ContentEntityNormalizer.php @@ -18,7 +18,7 @@ class ContentEntityNormalizer extends EntityNormalizer { /** * {@inheritdoc} */ - public function normalize($entity, $format = NULL, array $context = []) { + public function normalize($entity, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { $context += [ 'account' => NULL, ]; diff --git a/core/modules/serialization/src/Normalizer/DateTimeIso8601Normalizer.php b/core/modules/serialization/src/Normalizer/DateTimeIso8601Normalizer.php index 45842536905..e4f24a78fb4 100644 --- a/core/modules/serialization/src/Normalizer/DateTimeIso8601Normalizer.php +++ b/core/modules/serialization/src/Normalizer/DateTimeIso8601Normalizer.php @@ -37,7 +37,7 @@ class DateTimeIso8601Normalizer extends DateTimeNormalizer { /** * {@inheritdoc} */ - public function normalize($datetime, $format = NULL, array $context = []) { + public function normalize($datetime, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { assert($datetime instanceof DateTimeIso8601); $field_item = $datetime->getParent(); // @todo Remove this in https://www.drupal.org/project/drupal/issues/2958416. diff --git a/core/modules/serialization/src/Normalizer/DateTimeNormalizer.php b/core/modules/serialization/src/Normalizer/DateTimeNormalizer.php index 61cb1a369fa..7f3ce583323 100644 --- a/core/modules/serialization/src/Normalizer/DateTimeNormalizer.php +++ b/core/modules/serialization/src/Normalizer/DateTimeNormalizer.php @@ -54,7 +54,7 @@ class DateTimeNormalizer extends NormalizerBase implements DenormalizerInterface /** * {@inheritdoc} */ - public function normalize($datetime, $format = NULL, array $context = []) { + public function normalize($datetime, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { assert($datetime instanceof DateTimeInterface); $drupal_date_time = $datetime->getDateTime(); if ($drupal_date_time === NULL) { diff --git a/core/modules/serialization/src/Normalizer/EntityReferenceFieldItemNormalizer.php b/core/modules/serialization/src/Normalizer/EntityReferenceFieldItemNormalizer.php index 8542b58d911..433cd5c421c 100644 --- a/core/modules/serialization/src/Normalizer/EntityReferenceFieldItemNormalizer.php +++ b/core/modules/serialization/src/Normalizer/EntityReferenceFieldItemNormalizer.php @@ -40,7 +40,7 @@ class EntityReferenceFieldItemNormalizer extends FieldItemNormalizer { /** * {@inheritdoc} */ - public function normalize($field_item, $format = NULL, array $context = []) { + public function normalize($field_item, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { $values = parent::normalize($field_item, $format, $context); $this->normalizeRootReferenceValue($values, $field_item); diff --git a/core/modules/serialization/src/Normalizer/ListNormalizer.php b/core/modules/serialization/src/Normalizer/ListNormalizer.php index 6d6fec01cc7..b52c24464d6 100644 --- a/core/modules/serialization/src/Normalizer/ListNormalizer.php +++ b/core/modules/serialization/src/Normalizer/ListNormalizer.php @@ -23,7 +23,7 @@ class ListNormalizer extends NormalizerBase { /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { $attributes = []; foreach ($object as $fieldItem) { $attributes[] = $this->serializer->normalize($fieldItem, $format, $context); diff --git a/core/modules/serialization/src/Normalizer/MarkupNormalizer.php b/core/modules/serialization/src/Normalizer/MarkupNormalizer.php index a695ca2342e..dafb49277e4 100644 --- a/core/modules/serialization/src/Normalizer/MarkupNormalizer.php +++ b/core/modules/serialization/src/Normalizer/MarkupNormalizer.php @@ -17,7 +17,7 @@ class MarkupNormalizer extends NormalizerBase { /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { return (string) $object; } diff --git a/core/modules/serialization/src/Normalizer/NullNormalizer.php b/core/modules/serialization/src/Normalizer/NullNormalizer.php index dbc61f78100..2479711b4bb 100644 --- a/core/modules/serialization/src/Normalizer/NullNormalizer.php +++ b/core/modules/serialization/src/Normalizer/NullNormalizer.php @@ -20,7 +20,7 @@ class NullNormalizer extends NormalizerBase { /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { return NULL; } diff --git a/core/modules/serialization/src/Normalizer/PrimitiveDataNormalizer.php b/core/modules/serialization/src/Normalizer/PrimitiveDataNormalizer.php index 873fbbb1139..d641d80fe9b 100644 --- a/core/modules/serialization/src/Normalizer/PrimitiveDataNormalizer.php +++ b/core/modules/serialization/src/Normalizer/PrimitiveDataNormalizer.php @@ -20,7 +20,7 @@ class PrimitiveDataNormalizer extends NormalizerBase { /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { // Add cacheability if applicable. $this->addCacheableDependency($context, $object); diff --git a/core/modules/serialization/src/Normalizer/TimestampItemNormalizer.php b/core/modules/serialization/src/Normalizer/TimestampItemNormalizer.php index 1669e6a7803..3d2ca4bbc6b 100644 --- a/core/modules/serialization/src/Normalizer/TimestampItemNormalizer.php +++ b/core/modules/serialization/src/Normalizer/TimestampItemNormalizer.php @@ -24,7 +24,7 @@ class TimestampItemNormalizer extends FieldItemNormalizer { /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { return parent::normalize($object, $format, $context) + [ // 'format' is not a property on Timestamp objects. This is present to // assist consumers of this data. diff --git a/core/modules/serialization/src/Normalizer/TypedDataNormalizer.php b/core/modules/serialization/src/Normalizer/TypedDataNormalizer.php index 4f094a1e1d1..014f91f1093 100644 --- a/core/modules/serialization/src/Normalizer/TypedDataNormalizer.php +++ b/core/modules/serialization/src/Normalizer/TypedDataNormalizer.php @@ -17,7 +17,7 @@ class TypedDataNormalizer extends NormalizerBase { /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { $this->addCacheableDependency($context, $object); $value = $object->getValue(); // Support for stringable value objects: avoid numerous custom normalizers. diff --git a/core/modules/serialization/tests/modules/field_normalization_test/src/Normalization/TextItemSillyNormalizer.php b/core/modules/serialization/tests/modules/field_normalization_test/src/Normalization/TextItemSillyNormalizer.php index 88f24149ca5..620693bd657 100644 --- a/core/modules/serialization/tests/modules/field_normalization_test/src/Normalization/TextItemSillyNormalizer.php +++ b/core/modules/serialization/tests/modules/field_normalization_test/src/Normalization/TextItemSillyNormalizer.php @@ -18,7 +18,7 @@ class TextItemSillyNormalizer extends FieldItemNormalizer { /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { $data = parent::normalize($object, $format, $context); $data['value'] .= '::silly_suffix'; return $data; diff --git a/core/modules/serialization/tests/modules/test_datatype_boolean_emoji_normalizer/src/Normalizer/BooleanNormalizer.php b/core/modules/serialization/tests/modules/test_datatype_boolean_emoji_normalizer/src/Normalizer/BooleanNormalizer.php index a2910eab046..fb979814be2 100644 --- a/core/modules/serialization/tests/modules/test_datatype_boolean_emoji_normalizer/src/Normalizer/BooleanNormalizer.php +++ b/core/modules/serialization/tests/modules/test_datatype_boolean_emoji_normalizer/src/Normalizer/BooleanNormalizer.php @@ -19,7 +19,7 @@ class BooleanNormalizer extends NormalizerBase implements DenormalizerInterface /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { return $object->getValue() ? '👍' : '👎'; } diff --git a/core/modules/serialization/tests/modules/test_fieldtype_boolean_emoji_normalizer/src/Normalizer/BooleanItemNormalizer.php b/core/modules/serialization/tests/modules/test_fieldtype_boolean_emoji_normalizer/src/Normalizer/BooleanItemNormalizer.php index f7de90d61ec..b06e062263b 100644 --- a/core/modules/serialization/tests/modules/test_fieldtype_boolean_emoji_normalizer/src/Normalizer/BooleanItemNormalizer.php +++ b/core/modules/serialization/tests/modules/test_fieldtype_boolean_emoji_normalizer/src/Normalizer/BooleanItemNormalizer.php @@ -19,7 +19,7 @@ class BooleanItemNormalizer extends FieldItemNormalizer implements DenormalizerI /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { $data = parent::normalize($object, $format, $context); $data['value'] = $data['value'] ? '👍' : '👎'; return $data; diff --git a/core/modules/serialization/tests/serialization_test/src/SerializationTestNormalizer.php b/core/modules/serialization/tests/serialization_test/src/SerializationTestNormalizer.php index cc205e8cd7a..ec8426dbddc 100644 --- a/core/modules/serialization/tests/serialization_test/src/SerializationTestNormalizer.php +++ b/core/modules/serialization/tests/serialization_test/src/SerializationTestNormalizer.php @@ -14,21 +14,9 @@ class SerializationTestNormalizer implements NormalizerInterface { protected static $format = 'serialization_test'; /** - * Normalizes an object into a set of arrays/scalars. - * - * @param object $object - * Object to normalize. - * @param string|null $format - * (optional) Format the normalization result will be encoded as. Defaults - * to NULL - * @param array $context - * (optional) The context data. Defaults to an empty array. - * - * @return array - * An array containing a normalized representation of $object, appropriate - * for encoding to the requested format. + * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL { $normalized = (array) $object; // Add identifying value that can be used to verify that the expected // normalizer was invoked. |