From 89e6ec9ffd4df1aa0e4adb56590ab1b88cbf7adf Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Sat, 21 Mar 2015 12:56:40 +0000 Subject: [PATCH] Issue #2388349 by almaudoh: FormState::cleanValues() doesn't conform with the FormStateInterface documentation --- core/lib/Drupal/Core/Form/FormState.php | 1 + core/tests/Drupal/Tests/Core/Form/FormStateTest.php | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/lib/Drupal/Core/Form/FormState.php b/core/lib/Drupal/Core/Form/FormState.php index dd2d262f5eb..9d651cd96f4 100644 --- a/core/lib/Drupal/Core/Form/FormState.php +++ b/core/lib/Drupal/Core/Form/FormState.php @@ -1241,6 +1241,7 @@ class FormState implements FormStateInterface { unset($values[$last_parent]); } } + return $this; } /** diff --git a/core/tests/Drupal/Tests/Core/Form/FormStateTest.php b/core/tests/Drupal/Tests/Core/Form/FormStateTest.php index 0c8a4784a07..24c4ddd28b5 100644 --- a/core/tests/Drupal/Tests/Core/Form/FormStateTest.php +++ b/core/tests/Drupal/Tests/Core/Form/FormStateTest.php @@ -565,8 +565,7 @@ class FormStateTest extends UnitTestCase { */ public function testCleanValues($form_state) { $form_state->setValue('value_to_keep', 'magic_ponies'); - $form_state->cleanValues(); - $this->assertSame($form_state->getValues(), ['value_to_keep' => 'magic_ponies']); + $this->assertSame($form_state->cleanValues()->getValues(), ['value_to_keep' => 'magic_ponies']); } }