diff -u b/core/profiles/demo_umami/config/install/block.block.breadcrumbs.yml b/core/profiles/demo_umami/config/install/block.block.breadcrumbs.yml --- b/core/profiles/demo_umami/config/install/block.block.breadcrumbs.yml +++ b/core/profiles/demo_umami/config/install/block.block.breadcrumbs.yml @@ -5,7 +5,6 @@ - system theme: - umami -_core: id: breadcrumbs theme: umami region: breadcrumbs diff -u b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.default.yml --- b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.default.yml @@ -11,7 +11,6 @@ - responsive_image - text - user -_core: id: node.article.default targetEntityType: node bundle: article diff -u b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.full.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.full.yml --- b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.full.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.full.yml @@ -12,7 +12,6 @@ - responsive_image - text - user -_core: id: node.article.full targetEntityType: node bundle: article diff -u b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_bottom.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_bottom.yml --- b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_bottom.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_bottom.yml @@ -11,7 +11,6 @@ module: - responsive_image - user -_core: id: node.article.highlighted_bottom targetEntityType: node bundle: article diff -u b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_small.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_small.yml --- b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_small.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_small.yml @@ -11,7 +11,6 @@ module: - responsive_image - user -_core: id: node.article.highlighted_small targetEntityType: node bundle: article diff -u b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_top.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_top.yml --- b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_top.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.highlighted_top.yml @@ -11,7 +11,6 @@ module: - responsive_image - user -_core: id: node.article.highlighted_top targetEntityType: node bundle: article diff -u b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.teaser.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.teaser.yml --- b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.teaser.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.teaser.yml @@ -12,7 +12,6 @@ - responsive_image - text - user -_core: id: node.article.teaser targetEntityType: node bundle: article diff -u b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.default.yml --- b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.default.yml @@ -20,7 +20,6 @@ - responsive_image - text - user -_core: id: node.recipe.default targetEntityType: node bundle: recipe diff -u b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_bottom.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_bottom.yml --- b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_bottom.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_bottom.yml @@ -19,7 +19,6 @@ module: - responsive_image - user -_core: id: node.recipe.highlighted_bottom targetEntityType: node bundle: recipe diff -u b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_small.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_small.yml --- b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_small.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_small.yml @@ -20,7 +20,6 @@ - options - responsive_image - user -_core: id: node.recipe.highlighted_small targetEntityType: node bundle: recipe diff -u b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_top.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_top.yml --- b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_top.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.highlighted_top.yml @@ -19,7 +19,6 @@ module: - responsive_image - user -_core: id: node.recipe.highlighted_top targetEntityType: node bundle: recipe diff -u b/core/profiles/demo_umami/config/install/views.view.frontpage.yml b/core/profiles/demo_umami/config/install/views.view.frontpage.yml --- b/core/profiles/demo_umami/config/install/views.view.frontpage.yml +++ b/core/profiles/demo_umami/config/install/views.view.frontpage.yml @@ -8,7 +8,6 @@ module: - node - user -_core: id: frontpage label: Frontpage module: node diff -u b/core/profiles/demo_umami/demo_umami.profile b/core/profiles/demo_umami/demo_umami.profile --- b/core/profiles/demo_umami/demo_umami.profile +++ b/core/profiles/demo_umami/demo_umami.profile @@ -33,9 +33,9 @@ // Add a warning about using an experimental profile. // @todo: This can be removed once a generic warning for experimental profiles has been introduced. // @see https://www.drupal.org/project/drupal/issues/2934374 - $items['experimental-profile-warning'] = array( + $items['experimental-profile-warning'] = [ '#type' => 'toolbar_item', - 'tab' => array( + 'tab' => [ '#type' => 'inline_template', '#template' => 'This installation is for demonstration purposes only.', '#context' => [ @@ -45,7 +45,7 @@ 'library' => ['demo_umami/toolbar-warning'], ], - ), + ], '#weight' => 999, - ); + ]; return $items; } diff -u b/core/profiles/demo_umami/demo_umami_content/tests/src/Functional/UninstallDefaultContentTest.php b/core/profiles/demo_umami/demo_umami_content/tests/src/Functional/UninstallDefaultContentTest.php --- b/core/profiles/demo_umami/demo_umami_content/tests/src/Functional/UninstallDefaultContentTest.php +++ b/core/profiles/demo_umami/demo_umami_content/tests/src/Functional/UninstallDefaultContentTest.php @@ -84,7 +84,7 @@ ->count() ->execute(); $this->assertGreaterThan(0, $count); - $nodes = $node_storage->loadByProperties(['title' => 'Cheesy smoked cod with mushrooms and pasta']); + $nodes = $node_storage->loadByProperties(['title' => 'Gluten free pizza']); $this->assertCount(1, $nodes); } @@ -98,7 +98,7 @@ // Verify that block is placed. $assert = $this->assertSession(); $this->drupalGet('/recipes'); - $assert->pageTextContains('Baked Camembert with garlic, calvados and salami'); + $assert->pageTextContains('Super easy vegetarian pasta bake'); $count = $block_storage->getQuery() ->condition('type', 'banner_block') diff -u b/core/profiles/demo_umami/src/Plugin/Block/UmamiDisclaimer.php b/core/profiles/demo_umami/src/Plugin/Block/UmamiDisclaimer.php --- b/core/profiles/demo_umami/src/Plugin/Block/UmamiDisclaimer.php +++ b/core/profiles/demo_umami/src/Plugin/Block/UmamiDisclaimer.php @@ -55,19 +55,19 @@ public function blockForm($form, FormStateInterface $form_state) { $form = parent::blockForm($form, $form_state); - $form['umami_disclaimer'] = array( + $form['umami_disclaimer'] = [ '#type' => 'text_format', '#title' => $this->t('Umami Disclaimer'), '#default_value' => $this->configuration['umami_disclaimer']['value'], '#format' => $this->configuration['umami_disclaimer']['format'], - ); + ]; - $form['umami_copyright'] = array( + $form['umami_copyright'] = [ '#type' => 'text_format', '#title' => $this->t('Umami Copyright Text'), '#default_value' => $this->configuration['umami_copyright']['value'], '#format' => $this->configuration['umami_copyright']['format'], - ); + ]; return $form; } diff -u b/core/profiles/demo_umami/src/Plugin/Block/UmamiFooterPromo.php b/core/profiles/demo_umami/src/Plugin/Block/UmamiFooterPromo.php --- b/core/profiles/demo_umami/src/Plugin/Block/UmamiFooterPromo.php +++ b/core/profiles/demo_umami/src/Plugin/Block/UmamiFooterPromo.php @@ -50,35 +50,35 @@ public function blockForm($form, FormStateInterface $form_state) { $form = parent::blockForm($form, $form_state); - $form['promo_title'] = array( + $form['promo_title'] = [ '#type' => 'textfield', '#title' => $this->t('Promo Title'), '#default_value' => $this->configuration['promo_title'], - ); + ]; - $form['promo_text'] = array( + $form['promo_text'] = [ '#type' => 'textarea', '#title' => $this->t('Promo Text'), '#default_value' => $this->configuration['promo_text'], - ); + ]; - $form['findmore'] = array( + $form['findmore'] = [ '#type' => 'fieldset', '#title' => $this->t('Find more'), - ); + ]; - $form['findmore']['url'] = array( + $form['findmore']['url'] = [ '#type' => 'url', '#title' => $this->t('URL'), '#default_value' => $this->configuration['findmore_url'], '#description' => $this->t('Enter an absolute url. Eg: https://www.drupal.org'), - ); + ]; - $form['findmore']['text'] = array( + $form['findmore']['text'] = [ '#type' => 'textfield', '#title' => $this->t('Text'), '#default_value' => $this->configuration['findmore_text'], - ); + ]; return $form; } diff -u b/core/profiles/demo_umami/tests/src/Functional/DemoUmamiProfileTest.php b/core/profiles/demo_umami/tests/src/Functional/DemoUmamiProfileTest.php --- b/core/profiles/demo_umami/tests/src/Functional/DemoUmamiProfileTest.php +++ b/core/profiles/demo_umami/tests/src/Functional/DemoUmamiProfileTest.php @@ -36,2 +36,3 @@ } + }