diff --git a/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php b/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php
index 2ed0a8fb4a930d96ee8340c5a2aec74f6c5f4010..de62934f673c824d034ed5cc34043e54196b3613 100644
--- a/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php
+++ b/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php
@@ -66,7 +66,7 @@ public function __construct(LinkManagerInterface $link_manager, EntityTypeManage
/**
* {@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 d078cf154a72d70619e686e3905572892df6fef4..6bd2d5226cef9001a377bcdb5258e10c9c2ad701 100644
--- a/core/modules/hal/src/Normalizer/EntityReferenceItemNormalizer.php
+++ b/core/modules/hal/src/Normalizer/EntityReferenceItemNormalizer.php
@@ -63,7 +63,7 @@ public function __construct(LinkManagerInterface $link_manager, EntityResolverIn
/**
* {@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 f4d8447ee19964c7406383fec980f3bce0f18b15..50b6466d41f329a298bc10fb39cce5bc2fd4b987 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 1ac987c1ef4e073801239a8650b1147b297759dd..75af3011fdb81c2e813e708c55ec913506446ec1 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 e109dd32c52e9960483f8c8f2c86054b58dc4d20..f022f9fe70cef74e79a710cea3054fdf3a79fdb3 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 a5715dedae7daf50377edde7a0f35b2d66fdd4a4..fcbfc197c47a8db9f4ae5f8112865abfc7118750 100644
--- a/core/modules/jsonapi/src/Normalizer/EntityDenormalizerBase.php
+++ b/core/modules/jsonapi/src/Normalizer/EntityDenormalizerBase.php
@@ -74,7 +74,7 @@ public function supportsNormalization($data, $format = NULL): bool {
/**
* {@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 de46d4d36960effe0ac99a93074d487f870b61aa..8472c1dacff5c824f9cef4f75f337b5c5db3be8e 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 7a26ebe62816b04246702af295d62b54d2480701..4fb2281b6a5e4f324d1d7bbc1d90b40b77bf3267 100644
--- a/core/modules/jsonapi/src/Normalizer/FieldItemNormalizer.php
+++ b/core/modules/jsonapi/src/Normalizer/FieldItemNormalizer.php
@@ -59,7 +59,7 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager) {
* 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 eaa1d56ecf53561edfe3427c3c301201ba8afb9b..c78f41d6e71ddaf2f6f58e410e6fbbe99be32918 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 0b91b4d92f39e7a7374f2d17e8d6bb7ffaf5b871..22f57b11678661273022933dc062182d9d0a1b12 100644
--- a/core/modules/jsonapi/src/Normalizer/HttpExceptionNormalizer.php
+++ b/core/modules/jsonapi/src/Normalizer/HttpExceptionNormalizer.php
@@ -48,7 +48,7 @@ public function __construct(AccountInterface $current_user) {
/**
* {@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 0c9d45fca20f8d7f2acf8e3ca24b555e0fda61b4..d895a22758c9b0bdf5bb5eb5c6b2ba6870110b30 100644
--- a/core/modules/jsonapi/src/Normalizer/JsonApiDocumentTopLevelNormalizer.php
+++ b/core/modules/jsonapi/src/Normalizer/JsonApiDocumentTopLevelNormalizer.php
@@ -172,7 +172,7 @@ public function denormalize($data, $class, $format = NULL, array $context = []):
/**
* {@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 0e95e41d5bc16ec8bc217ed4f96256d55707a2ee..f5a1383f249d63f3135c6525141abe77e19685b0 100644
--- a/core/modules/jsonapi/src/Normalizer/LinkCollectionNormalizer.php
+++ b/core/modules/jsonapi/src/Normalizer/LinkCollectionNormalizer.php
@@ -90,7 +90,7 @@ public function __construct(AccountInterface $current_user = NULL) {
/**
* {@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 53354af0b6a22fc30b80d9237e8b2d3eacc8d8a5..e7802e787d8dd8664fb6564496b0e0521931c6e6 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 2b9837ae0d3d84cf4d87771c412faefa48e2337d..10ab8546ab275ab87a80633a0752811f25d8e055 100644
--- a/core/modules/jsonapi/src/Normalizer/ResourceIdentifierNormalizer.php
+++ b/core/modules/jsonapi/src/Normalizer/ResourceIdentifierNormalizer.php
@@ -48,7 +48,7 @@ public function __construct(EntityFieldManagerInterface $field_manager) {
/**
* {@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 a79eb95b54113744e409bead6165e9d84e8a8313..9c14c55d34d6138b08241ccb4649eeae15a834dd 100644
--- a/core/modules/jsonapi/src/Normalizer/ResourceObjectNormalizer.php
+++ b/core/modules/jsonapi/src/Normalizer/ResourceObjectNormalizer.php
@@ -54,7 +54,7 @@ public function supportsDenormalization($data, $type, $format = NULL) {
/**
* {@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 745fa30465a73f5eed64c4ad62bbaaf952830578..55f66ac3da8435f0b9e4f7d3f5d66b79533a331c 100644
--- a/core/modules/jsonapi/src/Serializer/Serializer.php
+++ b/core/modules/jsonapi/src/Serializer/Serializer.php
@@ -57,7 +57,7 @@ public function setFallbackNormalizer(NormalizerInterface $normalizer) {
/**
* {@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 7ceddc26346cb43b4bc2cc190e09feecf405c4ba..1f4220919da78df3eea6b94ff18109e3522af88d 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 89e5967134b71150e62c9571f9bcf62bb6b381a7..84697694f294f7c8553dea739e54651c57df6520 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 2f3f70e0efe9c3a8413550d641926a4929e95926..1c6f306a4e5d360e7ea8a28ad53c578c04b62460 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 f8f4c308d0d83d0384d56f1ef1ace2af909a0fbf..1c700f222f3044b87d221900098992a561546c37 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 a5d1e4f4915f6460b6057f80a426b3a856605dc1..b4ca7ff7d761c802fa0ca374c45ace93b6455420 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 0282ef2d51768233613d5a34a4a837a8235623b6..9e4b819622bd551c24ee3e14368097d44cd2da0c 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 458425369050adcd0975d610844560faf98cb1e4..e4f24a78fb4579d27c32fa957d0c9073f71da908 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 61cb1a369fa4f1e170a4a85e7efb4d8cc0940c88..7f3ce583323b5346527afc6221b566b394e21454 100644
--- a/core/modules/serialization/src/Normalizer/DateTimeNormalizer.php
+++ b/core/modules/serialization/src/Normalizer/DateTimeNormalizer.php
@@ -54,7 +54,7 @@ public function __construct(ConfigFactoryInterface $config_factory) {
/**
* {@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 8542b58d91131582e82b7b660b0c05c9a1b39671..433cd5c421cb96d8e3e7dae41159ba6f94be9663 100644
--- a/core/modules/serialization/src/Normalizer/EntityReferenceFieldItemNormalizer.php
+++ b/core/modules/serialization/src/Normalizer/EntityReferenceFieldItemNormalizer.php
@@ -40,7 +40,7 @@ public function __construct(EntityRepositoryInterface $entity_repository) {
/**
* {@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 6d6fec01cc7cededcab4845cf3de4830c951864e..b52c24464d6bf39838e0119a44686d70a24a7a02 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 a695ca2342e3f4248732c2fedd84058aaba24001..dafb49277e44bfa98e70df9f3de10cba010e6a6b 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 dbc61f78100f435b7c5f740cfc8ca9f5989859b4..2479711b4bb8fe5eaf96def27d6e37b3be5cb859 100644
--- a/core/modules/serialization/src/Normalizer/NullNormalizer.php
+++ b/core/modules/serialization/src/Normalizer/NullNormalizer.php
@@ -20,7 +20,7 @@ public function __construct($supported_interface_of_class) {
/**
* {@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 873fbbb11392b7415b68bb60e5f021b377d26a87..d641d80fe9b26f09f4e0d62c128f90e2e9a552dd 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 1669e6a7803b87446c91f1e03c4d7e5bfa6ceaf5..3d2ca4bbc6b69d168f22d74f70fcfb3cb550e369 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 4f094a1e1d1fbc8ef05c9f7d70f4be8014ee5f3b..014f91f10939d0b39e56e799ef41832aabf4228f 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 88f24149ca5791b897316994f8497f4450c45895..620693bd65725e295e2cf9e13005ecc7590844d1 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 a2910eab046cc05c8a70b7a05b0fbb2047db1ab8..fb979814be2a8916164a2a79e1bfcd71877c76c7 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 f7de90d61ec01680ab2335b8d022841157ab641b..b06e062263bdf0e1880dbdd517fdc511afc2ab1f 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 cc205e8cd7a9fa8f85a9017266ebc4957f2c8f44..ec8426dbddc9a53acd33f9052def1fc1f617032a 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.