Fix json_form_widget deprecation messages in PHP 8.2 (#4129)

GetDKAN · Feb 22, 2024 · a9cf4dc · a9cf4dc
1 parent c243fca
commit a9cf4dc
Show file tree

Hide file tree

Showing 12 changed files with 457 additions and 263 deletions.
diff --git a/cypress/integration/07_admin_dataset_json_form.spec.js b/cypress/integration/07_admin_dataset_json_form.spec.js
diff --git a/cypress/integration/11_admin_dataset_file_upload.spec.js b/cypress/integration/11_admin_dataset_file_upload.spec.js
diff --git a/modules/json_form_widget/json_form_widget.module b/modules/json_form_widget/json_form_widget.module
@@ -76,7 +76,7 @@ function _json_form_widget_build_count_property(array $button_element): array {
  */
 function json_form_widget_field_widget_complete_form_alter(&$field_widget_complete_form, FormStateInterface $form_state, $context) {
   if ($context['widget'] instanceof JsonFormWidget) {
-    $form_state->has_json_form_widget = TRUE;
+    $form_state->set('has_json_form_widget', TRUE);
   }
 }
 
@@ -86,10 +86,10 @@ function json_form_widget_field_widget_complete_form_alter(&$field_widget_comple
  * Add custom submit handler to form if it contains an upload_or_link element.
  */
 function json_form_widget_form_alter(&$form, FormStateInterface $form_state, $form_id) {
-  if (!isset($form['actions']['submit']) || !isset($form_state->has_json_form_widget)) {
+  if (!isset($form['actions']['submit'])) {
     return;
   }
-  if ($form_state->has_json_form_widget) {
+  if ($form_state->get('has_json_form_widget')) {
     $form['actions']['submit']['#submit'][] = 'json_form_widget_file_submit';
   }
 }

diff --git a/modules/json_form_widget/src/Plugin/Field/FieldWidget/JsonFormWidget.php b/modules/json_form_widget/src/Plugin/Field/FieldWidget/JsonFormWidget.php
@@ -55,7 +55,7 @@ class JsonFormWidget extends WidgetBase {
   protected ?string $schema;
 
   /**
-   * Constructs a WidgetBase object.
+   * Constructs a JsonFormWidget object.
    *
    * @param string $plugin_id
    *   The plugin_id for the widget.