Issue #2594425 follow-up by alexpott: Add the option in system menu block to "Expand all items in this tree"

Author: alexpott

core/modules/system/system.post_update.php

@@ -184,10 +184,6 @@ function system_post_update_states_clear_cache() {
  */
 function system_post_update_add_expand_all_items_key_in_system_menu_block(&$sandbox = NULL) {
   \Drupal::classResolver(ConfigEntityUpdater::class)->update($sandbox, 'block', function ($block) {
-    if (strpos($block->getPluginId(), 'system_menu_block:') === 0) {
-      $block->set('settings.expand_all_items', FALSE);
-      return TRUE;
-    }
-    return FALSE;
+    return strpos($block->getPluginId(), 'system_menu_block:') === 0;
   });
 }

core/modules/system/tests/src/Functional/Update/MenuBlockPostUpdateTest.php

@@ -32,7 +32,9 @@ protected function setDatabaseDumpFiles() {
   public function testPostUpdateMenuBlockFields() {
     $this->assertArrayNotHasKey('expand_all_items', Block::load('bartik_account_menu')->get('settings'));
     $this->runUpdates();
-    $this->assertArrayHasKey('expand_all_items', Block::load('bartik_account_menu')->get('settings'));
+    $settings = Block::load('bartik_account_menu')->get('settings');
+    $this->assertArrayHasKey('expand_all_items', $settings);
+    $this->assertFalse($settings['expand_all_items']);
   }
 
 }