Fix missing protected form state properties (#124)

I encountered this when working with views exposed filters.
retrofit-drupal · Dec 9, 2023 · cc7c019 · cc7c019
1 parent daaaa1f
commit cc7c019
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 10 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -320,11 +320,6 @@ parameters:
 			count: 1
 			path: src/Plugin/Field/FieldType/DecoratedFieldItem.php
 
-		-
-			message: "#^Method Retrofit\\\\Drupal\\\\Plugin\\\\Field\\\\FieldType\\\\DecoratedFieldItem\\:\\:applyDefaultValue\\(\\) return type has no value type specified in iterable type Drupal\\\\Core\\\\Field\\\\FieldItemInterface\\.$#"
-			count: 1
-			path: src/Plugin/Field/FieldType/DecoratedFieldItem.php
-
 		-
 			message: "#^Method Retrofit\\\\Drupal\\\\Plugin\\\\Field\\\\FieldType\\\\DecoratedFieldItem\\:\\:calculateDependencies\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1

diff --git a/src/Form/ArrayAccessFormState.php b/src/Form/ArrayAccessFormState.php
@@ -9,6 +9,11 @@
 
 final class ArrayAccessFormState extends FormState implements \ArrayAccess
 {
+    public function __construct(bool $errors = false)
+    {
+        static::setAnyErrors($errors);
+    }
+
     public function offsetExists(mixed $offset): bool
     {
         return isset($this->$offset);

diff --git a/src/Form/FormBuilder.php b/src/Form/FormBuilder.php
@@ -16,10 +16,47 @@ class FormBuilder extends CoreFormBuilder
      */
     public function buildForm(mixed $form_arg, FormStateInterface|array &$form_state): array
     {
-        $original_form_state = $form_state;
-        $form_state = new ArrayAccessFormState();
-        if ($original_form_state instanceof FormStateInterface) {
-            $original_form_state = $original_form_state->getCacheableArray() + get_object_vars($original_form_state);
+        if ($form_state instanceof FormStateInterface) {
+            $original_form_state = $form_state->getCacheableArray() + get_object_vars($form_state) + [
+                'always_process' => $form_state->getAlwaysProcess(),
+                'buttons' => $form_state->getButtons(),
+                'cleanValueKeys' => $form_state->getCleanValueKeys(),
+                'complete_form' => $form_state->getCompleteForm(),
+                'errors' => $form_state->getErrors(),
+                'executed' => $form_state->isExecuted(),
+                'groups' => $form_state->getGroups(),
+                'input' => $form_state->getUserInput(),
+                'invalidToken' => $form_state->hasInvalidToken(),
+                'limit_validation_errors' => $form_state->getLimitValidationErrors(),
+                'method' => match (true) {
+                    $form_state->isMethodType('POST') => 'POST',
+                    $form_state->isMethodType('GET') => 'GET',
+                    $form_state->isMethodType('HEAD') => 'HEAD',
+                    $form_state->isMethodType('OPTIONS') => 'OPTIONS',
+                    $form_state->isMethodType('PUT') => 'PUT',
+                    $form_state->isMethodType('DELETE') => 'DELETE',
+                    $form_state->isMethodType('TRACE') => 'TRACE',
+                    $form_state->isMethodType('CONNECT') => 'CONNECT',
+                    $form_state->isMethodType('PATCH') => 'PATCH',
+                    default => 'POST',
+                },
+                'must_validate' => $form_state->isValidationEnforced(),
+                'no_redirect' => $form_state->isRedirectDisabled(),
+                'rebuild' => $form_state->isRebuilding(),
+                'rebuild_info' => $form_state->getRebuildInfo(),
+                'redirect' => $form_state->getRedirect(),
+                'submitted' => $form_state->isSubmitted(),
+                'submit_handlers' => $form_state->getSubmitHandlers(),
+                'temporary' => $form_state->getTemporary(),
+                'triggering_element' => $form_state->getTriggeringElement(),
+                'validate_handlers' => $form_state->getValidateHandlers(),
+                'validation_complete' => $form_state->isValidationComplete(),
+                'values' => $form_state->getValues(),
+            ];
+            $form_state = new ArrayAccessFormState(call_user_func([get_class($form_state), 'hasAnyErrors']));
+        } else {
+            $original_form_state = $form_state;
+            $form_state = new ArrayAccessFormState();
         }
         foreach ($original_form_state as $offset => $value) {
             $form_state[$offset] = $value;

diff --git a/src/functions/form.php b/src/functions/form.php
@@ -4,7 +4,6 @@
 
 use Drupal\Core\Form\FormStateInterface;
 use Retrofit\Drupal\Form\DrupalGetForm;
-use Retrofit\Drupal\Form\ArrayAccessFormState;
 
 /**
  * @param mixed[] $form_state