Merge remote-tracking branch 'upstream/master' into update-belgrade

Author: lawxen

config/install/core.entity_view_display.node.article.default.yml

@@ -23,13 +23,6 @@ content:
     settings: {  }
     third_party_settings: {  }
     label: hidden
-  comment:
-    label: above
-    type: comment_default
-    weight: 20
-    settings:
-      pager_id: 0
-    third_party_settings: {  }
   field_image:
     type: image
     weight: -1

demo_commerce.info.yml

@@ -1,6 +1,6 @@
 name: Demo Commerce
 type: profile
-core: 8.x
+core_version_requirement: ^9
 description: 'Install with Drupal Commerce pre-configured.'
 distribution:
   name: 'Demo Commerce'

demo_commerce.install

@@ -8,6 +8,7 @@
 use Drupal\user\Entity\User;
 use Drupal\user\RoleInterface;
 use Drupal\user\UserInterface;
+use Drupal\shortcut\Entity\Shortcut;
 
 /**
  * Implements hook_install().
@@ -48,15 +49,15 @@ function demo_commerce_install() {
   user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, ['access shortcuts']);
 
   // Populate the default shortcut set.
-  $shortcut = entity_create('shortcut', [
+  $shortcut = Shortcut::create([
     'shortcut_set' => 'default',
     'title' => t('Add content'),
     'weight' => -20,
     'link' => ['uri' => 'internal:/node/add'],
   ]);
   $shortcut->save();
 
-  $shortcut = entity_create('shortcut', [
+  $shortcut = Shortcut::create([
     'shortcut_set' => 'default',
     'title' => t('All content'),
     'weight' => -19,