Security update for Core, with self-updated composer

[yaffs-website] / web / core / modules / hal / src / Normalizer / FieldNormalizer.php

diff --git a/web/core/modules/hal/src/Normalizer/FieldNormalizer.php b/web/core/modules/hal/src/Normalizer/FieldNormalizer.php
index a4e175323ac1c38453609e1bf84a5c1a51edd144..1ac987c1ef4e073801239a8650b1147b297759dd 100644 (file)
--- a/web/core/modules/hal/src/Normalizer/FieldNormalizer.php
+++ b/web/core/modules/hal/src/Normalizer/FieldNormalizer.php
@@ -11,27 +11,25 @@ use Drupal\serialization\Normalizer\FieldNormalizer as SerializationFieldNormali
 class FieldNormalizer extends SerializationFieldNormalizer {
 
   /**
-   * The formats that the Normalizer can handle.
-   *
-   * @var array
+   * {@inheritdoc}
    */
   protected $format = ['hal_json'];
 
   /**
    * {@inheritdoc}
    */
-  public function normalize($field, $format = NULL, array $context = []) {
+  public function normalize($field_items, $format = NULL, array $context = []) {
     $normalized_field_items = [];
 
     // Get the field definition.
-    $entity = $field->getEntity();
-    $field_name = $field->getName();
-    $field_definition = $field->getFieldDefinition();
+    $entity = $field_items->getEntity();
+    $field_name = $field_items->getName();
+    $field_definition = $field_items->getFieldDefinition();
 
     // If this field is not translatable, it can simply be normalized without
     // separating it into different translations.
     if (!$field_definition->isTranslatable()) {
-      $normalized_field_items = $this->normalizeFieldItems($field, $format, $context);
+      $normalized_field_items = $this->normalizeFieldItems($field_items, $format, $context);
     }
     // Otherwise, the languages have to be extracted from the entity and passed
     // in to the field item normalizer in the context. The langcode is appended
@@ -40,22 +38,21 @@ class FieldNormalizer extends SerializationFieldNormalizer {
       foreach ($entity->getTranslationLanguages() as $language) {
         $context['langcode'] = $language->getId();
         $translation = $entity->getTranslation($language->getId());
-        $translated_field = $translation->get($field_name);
-        $normalized_field_items = array_merge($normalized_field_items, $this->normalizeFieldItems($translated_field, $format, $context));
+        $translated_field_items = $translation->get($field_name);
+        $normalized_field_items = array_merge($normalized_field_items, $this->normalizeFieldItems($translated_field_items, $format, $context));
       }
     }
 
     // Merge deep so that links set in entity reference normalizers are merged
     // into the links property.
-    $normalized = NestedArray::mergeDeepArray($normalized_field_items);
-    return $normalized;
+    return NestedArray::mergeDeepArray($normalized_field_items);
   }
 
   /**
    * Helper function to normalize field items.
    *
-   * @param \Drupal\Core\Field\FieldItemListInterface $field
-   *   The field object.
+   * @param \Drupal\Core\Field\FieldItemListInterface $field_items
+   *   The field item list object.
    * @param string $format
    *   The format.
    * @param array $context
@@ -64,10 +61,10 @@ class FieldNormalizer extends SerializationFieldNormalizer {
    * @return array
    *   The array of normalized field items.
    */
-  protected function normalizeFieldItems($field, $format, $context) {
+  protected function normalizeFieldItems($field_items, $format, $context) {
     $normalized_field_items = [];
-    if (!$field->isEmpty()) {
-      foreach ($field as $field_item) {
+    if (!$field_items->isEmpty()) {
+      foreach ($field_items as $field_item) {
         $normalized_field_items[] = $this->serializer->normalize($field_item, $format, $context);
       }
     }