From dbb87e1b9e8c76a948da7d1325f69c1a482e3ee3 Mon Sep 17 00:00:00 2001
From: Lee Rowlands <lee.rowlands@previousnext.com.au>
Date: Tue, 6 Aug 2019 16:09:53 +1000
Subject: [PATCH] Issue #3071765 by joelpittet: Field without widget returning
NULL instead of array in defaultValuesFormSubmit()
---
core/lib/Drupal/Core/Field/FieldItemList.php | 1 +
core/tests/Drupal/Tests/Core/Field/FieldItemListTest.php | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/core/lib/Drupal/Core/Field/FieldItemList.php b/core/lib/Drupal/Core/Field/FieldItemList.php
index ae7298e43cf8..4bab6f40ac50 100644
--- a/core/lib/Drupal/Core/Field/FieldItemList.php
+++ b/core/lib/Drupal/Core/Field/FieldItemList.php
@@ -322,6 +322,7 @@ public function defaultValuesFormSubmit(array $element, array &$form, FormStateI
$widget->extractFormValues($this, $element, $form_state);
return $this->getValue();
}
+ return [];
}
/**
diff --git a/core/tests/Drupal/Tests/Core/Field/FieldItemListTest.php b/core/tests/Drupal/Tests/Core/Field/FieldItemListTest.php
index 1d9a19e0e5fc..1dd4e672113f 100644
--- a/core/tests/Drupal/Tests/Core/Field/FieldItemListTest.php
+++ b/core/tests/Drupal/Tests/Core/Field/FieldItemListTest.php
@@ -330,7 +330,7 @@ public function testDefaultValuesFormSubmit() {
$field_list->expects($this->never())
->method('getValue');
- $this->assertNull($field_list->defaultValuesFormSubmit([], $form, $form_state));
+ $this->assertArrayEquals([], $field_list->defaultValuesFormSubmit([], $form, $form_state));
}
}
--
GitLab