Core and composer updates

web/core/modules/block_content/block_content.module

@@ -18,7 +18,7 @@ function block_content_help($route_name, RouteMatchInterface $route_match) {
       $field_ui = \Drupal::moduleHandler()->moduleExists('field_ui') ? \Drupal::url('help.page', ['name' => 'field_ui']) : '#';
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Custom Block module allows you to create and manage custom <em>block types</em> and <em>content-containing blocks</em> from the <a href = ":block-library" >Custom block library<a/> page. Custom block types have fields; see the <a href=":field-help">Field module help</a> for more information. Once created, custom blocks can be placed in regions just like blocks provided by other modules; see the <a href=":blocks">Block module help</a> page for details. For more information, see the <a href=":online-help">online documentation for the Custom Block module</a>.', [':block-library' => \Drupal::url('entity.block_content.collection'), ':block-content' => \Drupal::url('entity.block_content.collection'), ':field-help' => \Drupal::url('help.page', ['name' => 'field']), ':blocks' => \Drupal::url('help.page', ['name' => 'block']), ':online-help' => 'https://www.drupal.org/documentation/modules/block_content']) . '</p>';
+      $output .= '<p>' . t('The Custom Block module allows you to create and manage custom <em>block types</em> and <em>content-containing blocks</em> from the <a href = ":block-library" >Custom block library</a> page. Custom block types have fields; see the <a href=":field-help">Field module help</a> for more information. Once created, custom blocks can be placed in regions just like blocks provided by other modules; see the <a href=":blocks">Block module help</a> page for details. For more information, see the <a href=":online-help">online documentation for the Custom Block module</a>.', [':block-library' => \Drupal::url('entity.block_content.collection'), ':block-content' => \Drupal::url('entity.block_content.collection'), ':field-help' => \Drupal::url('help.page', ['name' => 'field']), ':blocks' => \Drupal::url('help.page', ['name' => 'block']), ':online-help' => 'https://www.drupal.org/documentation/modules/block_content']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Creating and managing custom block types') . '</dt>';

web/core/modules/block_content/block_content.routing.yml

@@ -79,6 +79,7 @@ entity.block_content_type.edit_form:
   path: '/admin/structure/block/block-content/manage/{block_content_type}'
   defaults:
     _entity_form: 'block_content_type.edit'
+    _title_callback: '\Drupal\Core\Entity\Controller\EntityController::title'
   requirements:
     _entity_access: 'block_content_type.update'
 

web/core/modules/block_content/migration_templates/block_content_entity_display.yml

@@ -0,0 +1,39 @@
+id: block_content_entity_display
+label: Body field display configuration
+migration_tags:
+  - Drupal 6
+  - Drupal 7
+source:
+  plugin: embedded_data
+  data_rows:
+    -
+      entity_type: block_content
+      bundle: basic
+      view_mode: default
+      field_name: body
+      options:
+        label: hidden
+  ids:
+    entity_type:
+      type: string
+    bundle:
+      type: string
+    view_mode:
+      type: string
+    field_name:
+      type: string
+process:
+  entity_type: entity_type
+  bundle: bundle
+  view_mode: view_mode
+  field_name: field_name
+  options: options
+destination:
+  plugin: component_entity_display
+migration_dependencies:
+  required:
+    - block_content_body_field
+provider:
+  - block_content
+  - migrate_drupal
+

web/core/modules/block_content/migration_templates/block_content_entity_form_display.yml

@@ -0,0 +1,36 @@
+id: block_content_entity_form_display
+label: Body field form display configuration
+migration_tags:
+  - Drupal 6
+  - Drupal 7
+source:
+  plugin: embedded_data
+  data_rows:
+    -
+      entity_type: block_content
+      bundle: basic
+      form_mode: default
+      field_name: body
+  ids:
+    entity_type:
+      type: string
+    bundle:
+      type: string
+    form_mode:
+      type: string
+    field_name:
+      type: string
+process:
+  entity_type: entity_type
+  bundle: bundle
+  form_mode: form_mode
+  field_name: field_name
+destination:
+  plugin: component_entity_form_display
+migration_dependencies:
+  required:
+    - block_content_body_field
+provider:
+  - block_content
+  - migrate_drupal
+

web/core/modules/block_content/migration_templates/d6_custom_block.yml

@@ -8,7 +8,7 @@ process:
   id: bid
   info: info
   'body/format':
-    plugin: migration
+    plugin: migration_lookup
     migration: d6_filter_format
     source: format
   'body/value': body

web/core/modules/block_content/migration_templates/d7_custom_block.yml

@@ -8,7 +8,7 @@ process:
   id: bid
   info: info
   'body/format':
-    plugin: migration
+    plugin: migration_lookup
     migration: d7_filter_format
     source: format
   'body/value': body

web/core/modules/block_content/src/Tests/BlockContentTypeTest.php

@@ -4,6 +4,8 @@ namespace Drupal\block_content\Tests;
 
 use Drupal\block_content\Entity\BlockContentType;
 use Drupal\Component\Utility\Html;
+use Drupal\Core\Url;
+use Drupal\system\Tests\Menu\AssertBreadcrumbTrait;
 
 /**
  * Ensures that custom block type functions work correctly.
@@ -12,6 +14,7 @@ use Drupal\Component\Utility\Html;
  */
 class BlockContentTypeTest extends BlockContentTestBase {
 
+  use AssertBreadcrumbTrait;
   /**
    * Modules to enable.
    *
@@ -91,6 +94,7 @@ class BlockContentTypeTest extends BlockContentTestBase {
    * Tests editing a block type using the UI.
    */
   public function testBlockContentTypeEditing() {
+    $this->drupalPlaceBlock('system_breadcrumb_block');
     // Now create an initial block-type.
     $this->createBlockContentType('basic', TRUE);
 
@@ -113,6 +117,13 @@ class BlockContentTypeTest extends BlockContentTestBase {
     $this->drupalGet('admin/structure/block/block-content/manage/basic');
     $this->assertTitle(format_string('Edit @type custom block type | Drupal', ['@type' => 'basic']));
     $this->drupalPostForm(NULL, $edit, t('Save'));
+    $front_page_path = Url::fromRoute('<front>')->toString();
+    $this->assertBreadcrumb('admin/structure/block/block-content/manage/basic/fields', [
+      $front_page_path => 'Home',
+      'admin/structure/block' => 'Block layout',
+      'admin/structure/block/block-content' => 'Custom block library',
+      'admin/structure/block/block-content/manage/basic' => 'Bar',
+    ]);
     \Drupal::entityManager()->clearCachedFieldDefinitions();
 
     $this->drupalGet('block/add');

web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentEntityDisplayTest.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Drupal\Tests\block_content\Kernel\Migrate;
+
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of block content body field display configuration.
+ *
+ * @group block_content
+ */
+class MigrateBlockContentEntityDisplayTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['block', 'block_content', 'filter', 'text'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->executeMigrations([
+      'block_content_type',
+      'block_content_body_field',
+      'block_content_entity_display',
+    ]);
+  }
+
+  /**
+   * Asserts a display entity.
+   *
+   * @param string $id
+   *   The entity ID.
+   * @param string $component_id
+   *   The ID of the display component.
+   */
+  protected function assertDisplay($id, $component_id) {
+    $component = EntityViewDisplay::load($id)->getComponent($component_id);
+    $this->assertInternalType('array', $component);
+    $this->assertSame('hidden', $component['label']);
+  }
+
+  /**
+   * Tests the migrated display configuration.
+   */
+  public function testMigration() {
+    $this->assertDisplay('block_content.basic.default', 'body');
+  }
+
+}

web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentEntityFormDisplayTest.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Drupal\Tests\block_content\Kernel\Migrate;
+
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of block content body field form display configuration.
+ *
+ * @group block_content
+ */
+class MigrateBlockContentEntityFormDisplayTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['block', 'block_content', 'filter', 'text'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->executeMigrations([
+      'block_content_type',
+      'block_content_body_field',
+      'block_content_entity_form_display',
+    ]);
+  }
+
+  /**
+   * Asserts a display entity.
+   *
+   * @param string $id
+   *   The entity ID.
+   * @param string $component
+   *   The ID of the form component.
+   */
+  protected function assertDisplay($id, $component_id) {
+    $component = EntityFormDisplay::load($id)->getComponent($component_id);
+    $this->assertInternalType('array', $component);
+    $this->assertSame('text_textarea_with_summary', $component['type']);
+  }
+
+  /**
+   * Tests the migrated display configuration.
+   */
+  public function testMigration() {
+    $this->assertDisplay('block_content.basic.default', 'body');
+  }
+
+}