Upgrading drupal/views_fieldsets (4.0.0 => 4.0.1)

composer.json

@@ -165,7 +165,7 @@
         "drupal/views_autocomplete_filters": "^2.0",
         "drupal/views_bootstrap": "^3.9",
         "drupal/views_bulk_operations": "4.2.6",
-        "drupal/views_fieldsets": "^4",
+        "drupal/views_fieldsets": "4.0.1",
         "drupal/views_infinite_scroll": "2.0.2",
         "drupal/webform": "^6.2",
         "drush-ops/behat-drush-endpoint": "0.0.5",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "053b43d07702837a5ece46f9991946fb",
+    "content-hash": "6f57982dfdd6fc2d543ffab1d7756a01",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -6771,17 +6771,17 @@
         },
         {
             "name": "drupal/views_fieldsets",
-            "version": "4.0.0",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/views_fieldsets.git",
-                "reference": "4.0.0"
+                "reference": "4.0.1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/views_fieldsets-4.0.0.zip",
-                "reference": "4.0.0",
-                "shasum": "640e2ad1d38b5e507eff0da482df46705c49754d"
+                "url": "https://ftp.drupal.org/files/projects/views_fieldsets-4.0.1.zip",
+                "reference": "4.0.1",
+                "shasum": "bc5fa9f6ded865f452d9d72e056ef4e1268df210"
             },
             "require": {
                 "drupal/core": ">=9"
@@ -6789,8 +6789,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "4.0.0",
-                    "datestamp": "1693927686",
+                    "version": "4.0.1",
+                    "datestamp": "1710203409",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"

vendor/composer/installed.json

@@ -7105,18 +7105,18 @@
         },
         {
             "name": "drupal/views_fieldsets",
-            "version": "4.0.0",
-            "version_normalized": "4.0.0.0",
+            "version": "4.0.1",
+            "version_normalized": "4.0.1.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/views_fieldsets.git",
-                "reference": "4.0.0"
+                "reference": "4.0.1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/views_fieldsets-4.0.0.zip",
-                "reference": "4.0.0",
-                "shasum": "640e2ad1d38b5e507eff0da482df46705c49754d"
+                "url": "https://ftp.drupal.org/files/projects/views_fieldsets-4.0.1.zip",
+                "reference": "4.0.1",
+                "shasum": "bc5fa9f6ded865f452d9d72e056ef4e1268df210"
             },
             "require": {
                 "drupal/core": ">=9"
@@ -7124,8 +7124,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "4.0.0",
-                    "datestamp": "1693927686",
+                    "version": "4.0.1",
+                    "datestamp": "1710203409",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"

vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'osu-asc-webservices/d8-upstream',
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => '49b18ef265ef624d5249bb83e51fb4f0d96c18b0',
+        'reference' => 'fed7bdfcdbbe6204fe6a92c06a347a6574b2abf3',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -1160,9 +1160,9 @@
             'dev_requirement' => false,
         ),
         'drupal/views_fieldsets' => array(
-            'pretty_version' => '4.0.0',
-            'version' => '4.0.0.0',
-            'reference' => '4.0.0',
+            'pretty_version' => '4.0.1',
+            'version' => '4.0.1.0',
+            'reference' => '4.0.1',
             'type' => 'drupal-module',
             'install_path' => __DIR__ . '/../../web/modules/views_fieldsets',
             'aliases' => array(),
@@ -1411,7 +1411,7 @@
         'osu-asc-webservices/d8-upstream' => array(
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '49b18ef265ef624d5249bb83e51fb4f0d96c18b0',
+            'reference' => 'fed7bdfcdbbe6204fe6a92c06a347a6574b2abf3',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),

web/modules/views_fieldsets/.cspell-project-words.txt

+Elementtype
+GABB
+gabb
+getelementtype
+getwrapperelement
+rudiedirkx
+Wrapperelement

web/modules/views_fieldsets/src/Plugin/views/field/Fieldset.php

@@ -28,6 +28,7 @@ public static function getUiFieldParents(array $fields, $field_name) {
       $parents[] = $parent;
       $current_field = $parent;
     }
+
     return $parents;
   }
 

web/modules/views_fieldsets/src/RowFieldset.php

@@ -48,7 +48,7 @@ public function __construct($field, ResultRow $row) {
    * @param string $name
    *   Method's name.
    */
-  public function __isset($name) {
+  public function __isset(string $name) {
     return TRUE;
   }
 
@@ -58,7 +58,7 @@ public function __isset($name) {
    * @param string $name
    *   Method's name.
    */
-  public function __get($name) {
+  public function __get(string $name) {
     $method_name = 'get' . Unicode::ucwords($name);
     if (is_callable($method = [$this, $method_name])) {
       return call_user_func($method);
@@ -118,7 +118,7 @@ public function render() {
     if ($this->handler->options['collapsed'] && $this->getWrapperType() != 'div') {
       $element['#attributes']['class'][] = 'collapsed';
     }
-
+    // @phpstan-ignore-next-line
     return \Drupal::service('renderer')->render($element);
   }
 

web/modules/views_fieldsets/views_fieldsets.info.yml

@@ -4,7 +4,7 @@ description: Adds fieldsets to Views.
 package: Views
 core_version_requirement: '>=9'
 
-# Information added by Drupal.org packaging script on 2023-09-05
-version: '4.0.0'
+# Information added by Drupal.org packaging script on 2024-03-12
+version: '4.0.1'
 project: 'views_fieldsets'
-datestamp: 1693927688
+datestamp: 1710203412

web/modules/views_fieldsets/views_fieldsets.module

@@ -94,7 +94,7 @@ function views_fieldsets_views_ui_display_tab_alter(&$build, ViewUI $ui_view, $d
   if (Fieldset::isFieldsetView($view)) {
     $fieldsets = Fieldset::getAllFieldsets($view);
     foreach ($build['details']['columns']['first']['fields']['fields'] as $field_name => &$renderable) {
-      // Noticable fieldsets.
+      // Noticeable fieldsets.
       if (isset($fieldsets[$field_name])) {
         $renderable['#class'][] = 'views-fieldsets-fieldset';
       }
@@ -125,8 +125,11 @@ function views_fieldsets_form_views_ui_rearrange_form_alter(&$form, &$form_state
   $field_display = $form_state->getStorage()['type'];
   if ($field_display === 'field') {
     $ui_view = $form_state->get('view');
+    $display_id = $form_state->get('display_id');
     $view = $ui_view->getExecutable();
-    $view->build($form_state->get('display_id'));
+    $view->inited = FALSE;
+    $view->build($display_id);
+    $ui_view->set('executable', $view);
     $fieldsets = Fieldset::getAllFieldsets($view);
     $debug_tabledrag = [];
     foreach (Element::children($form['fields']) as $field_name) {