upgrades core to 8.4.2

core/modules/block_content/block_content.info.yml

@@ -10,8 +10,8 @@ dependencies:
   - user
 configure: entity.block_content.collection
 
-# Information added by Drupal.org packaging script on 2017-08-16
-version: '8.3.7'
+# Information added by Drupal.org packaging script on 2017-11-03
+version: '8.4.2'
 core: '8.x'
 project: 'drupal'
-datestamp: 1502903957
+datestamp: 1509719929

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>';

core/modules/block_content/block_content.services.yml

@@ -0,0 +1,6 @@
+services:
+  block_content.uuid_lookup:
+    class: \Drupal\block_content\BlockContentUuidLookup
+    arguments: ['@cache.bootstrap', '@lock', '@entity_type.manager']
+    tags:
+      - { name: needs_destruction }

core/modules/block_content/migration_templates/block_content_body_field.yml

@@ -19,6 +19,7 @@ source:
       type: string
     field_name:
       type: string
+  source_module: block
 process:
   entity_type: entity_type
   bundle: bundle

core/modules/block_content/migration_templates/block_content_entity_display.yml

@@ -22,6 +22,7 @@ source:
       type: string
     field_name:
       type: string
+  source_module: block
 process:
   entity_type: entity_type
   bundle: bundle

core/modules/block_content/migration_templates/block_content_entity_form_display.yml

@@ -20,6 +20,7 @@ source:
       type: string
     field_name:
       type: string
+  source_module: block
 process:
   entity_type: entity_type
   bundle: bundle

core/modules/block_content/migration_templates/block_content_type.yml

@@ -12,6 +12,7 @@ source:
   ids:
     id:
       type: string
+  source_module: block
 process:
   id: id
   label: label

core/modules/block_content/src/BlockContentUuidLookup.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace Drupal\block_content;
+
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Cache\CacheCollector;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Lock\LockBackendInterface;
+
+/**
+ * A cache collector that caches IDs for block_content UUIDs.
+ *
+ * As block_content entities are used as block plugin derivatives, it is a
+ * fairly safe limitation that there are not hundreds of them, a site will
+ * likely run into problems with too many block content entities in other places
+ * than a cache that only stores UUID's and IDs. The same assumption is not true
+ * for other content entities.
+ *
+ * @internal
+ */
+class BlockContentUuidLookup extends CacheCollector {
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * Constructs a BlockContentUuidLookup instance.
+   *
+   * @param \Drupal\Core\Cache\CacheBackendInterface $cache
+   *   The cache backend.
+   * @param \Drupal\Core\Lock\LockBackendInterface $lock
+   *   The lock backend.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
+   */
+  public function __construct(CacheBackendInterface $cache, LockBackendInterface $lock, EntityTypeManagerInterface $entity_type_manager) {
+    parent::__construct('block_content_uuid', $cache, $lock);
+    $this->entityTypeManager = $entity_type_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function resolveCacheMiss($key) {
+    $ids = $this->entityTypeManager->getStorage('block_content')->getQuery()
+      ->condition('uuid', $key)
+      ->execute();
+
+    // Only cache if there is a match, otherwise creating new entities would
+    // require to invalidate the cache.
+    $id = reset($ids);
+    if ($id) {
+      $this->storage[$key] = $id;
+      $this->persist($key);
+    }
+    return $id;
+  }
+
+}

core/modules/block_content/src/Entity/BlockContent.php

@@ -42,6 +42,7 @@ use Drupal\user\UserInterface;
  *     "delete-form" = "/block/{block_content}/delete",
  *     "edit-form" = "/block/{block_content}",
  *     "collection" = "/admin/structure/block/block-content",
+ *     "create" = "/block",
  *   },
  *   translatable = TRUE,
  *   entity_keys = {
@@ -52,6 +53,11 @@ use Drupal\user\UserInterface;
  *     "langcode" = "langcode",
  *     "uuid" = "uuid"
  *   },
+ *   revision_metadata_keys = {
+ *     "revision_user" = "revision_user",
+ *     "revision_created" = "revision_created",
+ *     "revision_log_message" = "revision_log"
+ *   },
  *   bundle_entity_type = "block_content_type",
  *   field_ui_base_route = "entity.block_content_type.edit_form",
  *   render_cache = FALSE,
@@ -210,13 +216,6 @@ class BlockContent extends ContentEntityBase implements BlockContentInterface {
       ->setSetting('target_type', 'user')
       ->setRevisionable(TRUE);
 
-    $fields['revision_translation_affected'] = BaseFieldDefinition::create('boolean')
-      ->setLabel(t('Revision translation affected'))
-      ->setDescription(t('Indicates if the last edit of a translation belongs to current revision.'))
-      ->setReadOnly(TRUE)
-      ->setRevisionable(TRUE)
-      ->setTranslatable(TRUE);
-
     return $fields;
   }
 

core/modules/block_content/src/Plugin/Block/BlockContentBlock.php

@@ -2,10 +2,12 @@
 
 namespace Drupal\block_content\Plugin\Block;
 
+use Drupal\block_content\BlockContentUuidLookup;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Block\BlockBase;
 use Drupal\Core\Block\BlockManagerInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityDisplayRepositoryInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Routing\UrlGeneratorInterface;
@@ -32,11 +34,11 @@ class BlockContentBlock extends BlockBase implements ContainerFactoryPluginInter
   protected $blockManager;
 
   /**
-   * The entity manager service.
+   * The entity type manager service.
    *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
-  protected $entityManager;
+  protected $entityTypeManager;
 
   /**
    * The Drupal account to use for checking for access to block.
@@ -59,6 +61,20 @@ class BlockContentBlock extends BlockBase implements ContainerFactoryPluginInter
    */
   protected $urlGenerator;
 
+  /**
+   * The block content UUID lookup service.
+   *
+   * @var \Drupal\block_content\BlockContentUuidLookup
+   */
+  protected $uuidLookup;
+
+  /**
+   * The entity display repository.
+   *
+   * @var \Drupal\Core\Entity\EntityDisplayRepositoryInterface
+   */
+  protected $entityDisplayRepository;
+
   /**
    * Constructs a new BlockContentBlock.
    *
@@ -70,20 +86,26 @@ class BlockContentBlock extends BlockBase implements ContainerFactoryPluginInter
    *   The plugin implementation definition.
    * @param \Drupal\Core\Block\BlockManagerInterface $block_manager
    *   The Plugin Block Manager.
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *   The entity manager service.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager service.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The account for which view access should be checked.
    * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
    *   The URL generator.
+   * @param \Drupal\block_content\BlockContentUuidLookup $uuid_lookup
+   *   The block content UUID lookup service.
+   * @param \Drupal\Core\Entity\EntityDisplayRepositoryInterface $entity_display_repository
+   *   The entity display repository.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, BlockManagerInterface $block_manager, EntityManagerInterface $entity_manager, AccountInterface $account, UrlGeneratorInterface $url_generator) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, BlockManagerInterface $block_manager, EntityTypeManagerInterface $entity_type_manager, AccountInterface $account, UrlGeneratorInterface $url_generator, BlockContentUuidLookup $uuid_lookup, EntityDisplayRepositoryInterface $entity_display_repository) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
 
     $this->blockManager = $block_manager;
-    $this->entityManager = $entity_manager;
+    $this->entityTypeManager = $entity_type_manager;
     $this->account = $account;
     $this->urlGenerator = $url_generator;
+    $this->uuidLookup = $uuid_lookup;
+    $this->entityDisplayRepository = $entity_display_repository;
   }
 
   /**
@@ -95,9 +117,11 @@ class BlockContentBlock extends BlockBase implements ContainerFactoryPluginInter
       $plugin_id,
       $plugin_definition,
       $container->get('plugin.manager.block'),
-      $container->get('entity.manager'),
+      $container->get('entity_type.manager'),
       $container->get('current_user'),
-      $container->get('url_generator')
+      $container->get('url_generator'),
+      $container->get('block_content.uuid_lookup'),
+      $container->get('entity_display.repository')
     );
   }
 
@@ -118,9 +142,11 @@ class BlockContentBlock extends BlockBase implements ContainerFactoryPluginInter
    * Adds body and description fields to the block configuration form.
    */
   public function blockForm($form, FormStateInterface $form_state) {
-    $uuid = $this->getDerivativeId();
-    $block = $this->entityManager->loadEntityByUuid('block_content', $uuid);
-    $options = $this->entityManager->getViewModeOptionsByBundle('block_content', $block->bundle());
+    $block = $this->getEntity();
+    if (!$block) {
+      return $form;
+    }
+    $options = $this->entityDisplayRepository->getViewModeOptionsByBundle('block_content', $block->bundle());
 
     $form['view_mode'] = [
       '#type' => 'select',
@@ -158,7 +184,7 @@ class BlockContentBlock extends BlockBase implements ContainerFactoryPluginInter
    */
   public function build() {
     if ($block = $this->getEntity()) {
-      return $this->entityManager->getViewBuilder($block->getEntityTypeId())->view($block, $this->configuration['view_mode']);
+      return $this->entityTypeManager->getViewBuilder($block->getEntityTypeId())->view($block, $this->configuration['view_mode']);
     }
     else {
       return [
@@ -180,7 +206,9 @@ class BlockContentBlock extends BlockBase implements ContainerFactoryPluginInter
   protected function getEntity() {
     if (!isset($this->blockContent)) {
       $uuid = $this->getDerivativeId();
-      $this->blockContent = $this->entityManager->loadEntityByUuid('block_content', $uuid);
+      if ($id = $this->uuidLookup->get($uuid)) {
+        $this->blockContent = $this->entityTypeManager->getStorage('block_content')->load($id);
+      }
     }
     return $this->blockContent;
   }

core/modules/block_content/src/Plugin/migrate/source/d6/Box.php

@@ -8,7 +8,8 @@ use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
  * Drupal 6 block source from database.
  *
  * @MigrateSource(
- *   id = "d6_box"
+ *   id = "d6_box",
+ *   source_module = "block"
  * )
  */
 class Box extends DrupalSqlBase {

core/modules/block_content/src/Plugin/migrate/source/d7/BlockCustom.php

@@ -8,7 +8,8 @@ use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
  * Drupal 7 custom block source from database.
  *
  * @MigrateSource(
- *   id = "d7_block_custom"
+ *   id = "d7_block_custom",
+ *   source_module = "block"
  * )
  */
 class BlockCustom extends DrupalSqlBase {

core/modules/block_content/tests/modules/block_content_test/block_content_test.info.yml

@@ -7,8 +7,8 @@ package: Testing
 dependencies:
   - block_content
 
-# Information added by Drupal.org packaging script on 2017-08-16
-version: '8.3.7'
+# Information added by Drupal.org packaging script on 2017-11-03
+version: '8.4.2'
 core: '8.x'
 project: 'drupal'
-datestamp: 1502903957
+datestamp: 1509719929

core/modules/block_content/tests/modules/block_content_test_views/block_content_test_views.info.yml

@@ -8,8 +8,8 @@ dependencies:
   - block_content
   - views
 
-# Information added by Drupal.org packaging script on 2017-08-16
-version: '8.3.7'
+# Information added by Drupal.org packaging script on 2017-11-03
+version: '8.4.2'
 core: '8.x'
 project: 'drupal'
-datestamp: 1502903957
+datestamp: 1509719929

core/modules/block_content/tests/src/Functional/BlockContentCacheTagsTest.php

@@ -76,7 +76,7 @@ class BlockContentCacheTagsTest extends EntityCacheTagsTestBase {
     // Render the block.
     // @todo The request stack manipulation won't be necessary once
     //   https://www.drupal.org/node/2367555 is fixed and the
-    //   corresponding $request->isMethodSafe() checks are removed from
+    //   corresponding $request->isMethodCacheable() checks are removed from
     //   Drupal\Core\Render\Renderer.
     $request_stack = $this->container->get('request_stack');
     $request_stack->push(new Request());

core/modules/block_content/tests/src/Functional/BlockContentTypeTest.php

@@ -0,0 +1,250 @@
+<?php
+
+namespace Drupal\Tests\block_content\Functional;
+
+use Drupal\block_content\Entity\BlockContentType;
+use Drupal\Component\Utility\Html;
+use Drupal\Core\Url;
+use Drupal\Tests\system\Functional\Menu\AssertBreadcrumbTrait;
+
+/**
+ * Ensures that custom block type functions work correctly.
+ *
+ * @group block_content
+ */
+class BlockContentTypeTest extends BlockContentTestBase {
+
+  use AssertBreadcrumbTrait;
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['field_ui'];
+
+  /**
+   * Permissions to grant admin user.
+   *
+   * @var array
+   */
+  protected $permissions = [
+    'administer blocks',
+    'administer block_content fields'
+  ];
+
+  /**
+   * Whether or not to create an initial block type.
+   *
+   * @var bool
+   */
+  protected $autoCreateBasicBlockType = FALSE;
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->drupalPlaceBlock('page_title_block');
+  }
+
+  /**
+   * Tests creating a block type programmatically and via a form.
+   */
+  public function testBlockContentTypeCreation() {
+    // Log in a test user.
+    $this->drupalLogin($this->adminUser);
+
+    // Test the page with no block-types.
+    $this->drupalGet('block/add');
+    $this->assertResponse(200);
+    $this->assertText('You have not created any block types yet');
+    $this->clickLink('block type creation page');
+
+    // Create a block type via the user interface.
+    $edit = [
+      'id' => 'foo',
+      'label' => 'title for foo',
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Save'));
+    $block_type = BlockContentType::load('foo');
+    $this->assertTrue($block_type, 'The new block type has been created.');
+
+    $field_definitions = \Drupal::entityManager()->getFieldDefinitions('block_content', 'foo');
+    $this->assertTrue(isset($field_definitions['body']), 'Body field created when using the UI to create block content types.');
+
+    // Check that the block type was created in site default language.
+    $default_langcode = \Drupal::languageManager()->getDefaultLanguage()->getId();
+    $this->assertEqual($block_type->language()->getId(), $default_langcode);
+
+    // Create block types programmatically.
+    $this->createBlockContentType('basic', TRUE);
+    $field_definitions = \Drupal::entityManager()->getFieldDefinitions('block_content', 'basic');
+    $this->assertTrue(isset($field_definitions['body']), "Body field for 'basic' block type created when using the testing API to create block content types.");
+
+    $this->createBlockContentType('other');
+    $field_definitions = \Drupal::entityManager()->getFieldDefinitions('block_content', 'other');
+    $this->assertFalse(isset($field_definitions['body']), "Body field for 'other' block type not created when using the testing API to create block content types.");
+
+    $block_type = BlockContentType::load('other');
+    $this->assertTrue($block_type, 'The new block type has been created.');
+
+    $this->drupalGet('block/add/' . $block_type->id());
+    $this->assertResponse(200);
+  }
+
+  /**
+   * 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);
+
+    $this->drupalLogin($this->adminUser);
+    // We need two block types to prevent /block/add redirecting.
+    $this->createBlockContentType('other');
+
+    $field_definitions = \Drupal::entityManager()->getFieldDefinitions('block_content', 'other');
+    $this->assertFalse(isset($field_definitions['body']), 'Body field was not created when using the API to create block content types.');
+
+    // Verify that title and body fields are displayed.
+    $this->drupalGet('block/add/basic');
+    $this->assertRaw('Block description', 'Block info field was found.');
+    $this->assertNotEmpty($this->cssSelect('#edit-body-0-value'), 'Body field was found.');
+
+    // Change the block type name.
+    $edit = [
+      'label' => 'Bar',
+    ];
+    $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');
+    $this->assertRaw('Bar', 'New name was displayed.');
+    $this->clickLink('Bar');
+    $this->assertUrl(\Drupal::url('block_content.add_form', ['block_content_type' => 'basic'], ['absolute' => TRUE]), [], 'Original machine name was used in URL.');
+
+    // Remove the body field.
+    $this->drupalPostForm('admin/structure/block/block-content/manage/basic/fields/block_content.basic.body/delete', [], t('Delete'));
+    // Resave the settings for this type.
+    $this->drupalPostForm('admin/structure/block/block-content/manage/basic', [], t('Save'));
+    // Check that the body field doesn't exist.
+    $this->drupalGet('block/add/basic');
+    $this->assertEmpty($this->cssSelect('#edit-body-0-value'), 'Body field was not found.');
+  }
+
+  /**
+   * Tests deleting a block type that still has content.
+   */
+  public function testBlockContentTypeDeletion() {
+    // Now create an initial block-type.
+    $this->createBlockContentType('basic', TRUE);
+
+    // Create a block type programmatically.
+    $type = $this->createBlockContentType('foo');
+
+    $this->drupalLogin($this->adminUser);
+
+    // Add a new block of this type.
+    $block = $this->createBlockContent(FALSE, 'foo');
+    // Attempt to delete the block type, which should not be allowed.
+    $this->drupalGet('admin/structure/block/block-content/manage/' . $type->id() . '/delete');
+    $this->assertRaw(
+      t('%label is used by 1 custom block on your site. You can not remove this block type until you have removed all of the %label blocks.', ['%label' => $type->label()]),
+      'The block type will not be deleted until all blocks of that type are removed.'
+    );
+    $this->assertNoText(t('This action cannot be undone.'), 'The block type deletion confirmation form is not available.');
+
+    // Delete the block.
+    $block->delete();
+    // Attempt to delete the block type, which should now be allowed.
+    $this->drupalGet('admin/structure/block/block-content/manage/' . $type->id() . '/delete');
+    $this->assertRaw(
+      t('Are you sure you want to delete the custom block type %type?', ['%type' => $type->id()]),
+      'The block type is available for deletion.'
+    );
+    $this->assertText(t('This action cannot be undone.'), 'The custom block type deletion confirmation form is available.');
+  }
+
+  /**
+   * Tests that redirects work as expected when multiple block types exist.
+   */
+  public function testsBlockContentAddTypes() {
+    // Now create an initial block-type.
+    $this->createBlockContentType('basic', TRUE);
+
+    $this->drupalLogin($this->adminUser);
+    // Create two block types programmatically.
+    $type = $this->createBlockContentType('foo');
+    $type = $this->createBlockContentType('bar');
+
+    // Get the custom block storage.
+    $storage = $this->container
+      ->get('entity.manager')
+      ->getStorage('block_content');
+
+    // Install all themes.
+    \Drupal::service('theme_handler')->install(['bartik', 'seven', 'stark']);
+    $theme_settings = $this->config('system.theme');
+    foreach (['bartik', 'seven', 'stark'] as $default_theme) {
+      // Change the default theme.
+      $theme_settings->set('default', $default_theme)->save();
+      \Drupal::service('router.builder')->rebuild();
+
+      // For each installed theme, go to its block page and test the redirects.
+      foreach (['bartik', 'seven', 'stark'] as $theme) {
+        // Test that adding a block from the 'place blocks' form sends you to the
+        // block configure form.
+        $path = $theme == $default_theme ? 'admin/structure/block' : "admin/structure/block/list/$theme";
+        $this->drupalGet($path);
+        $this->clickLink('Place block');
+        $this->clickLink(t('Add custom block'));
+        // The seven theme has markup inside the link, we cannot use clickLink().
+        if ($default_theme == 'seven') {
+          $options = $theme != $default_theme ? ['query' => ['theme' => $theme]] : [];
+          $this->assertLinkByHref(\Drupal::url('block_content.add_form', ['block_content_type' => 'foo'], $options));
+          $this->drupalGet('block/add/foo', $options);
+        }
+        else {
+          $this->clickLink('foo');
+        }
+        // Create a new block.
+        $edit = ['info[0][value]' => $this->randomMachineName(8)];
+        $this->drupalPostForm(NULL, $edit, t('Save'));
+        $blocks = $storage->loadByProperties(['info' => $edit['info[0][value]']]);
+        if (!empty($blocks)) {
+          $block = reset($blocks);
+          $this->assertUrl(\Drupal::url('block.admin_add', ['plugin_id' => 'block_content:' . $block->uuid(), 'theme' => $theme], ['absolute' => TRUE]));
+          $this->drupalPostForm(NULL, ['region' => 'content'], t('Save block'));
+          $this->assertUrl(\Drupal::url('block.admin_display_theme', ['theme' => $theme], ['absolute' => TRUE, 'query' => ['block-placement' => Html::getClass($edit['info[0][value]'])]]));
+        }
+        else {
+          $this->fail('Could not load created block.');
+        }
+      }
+    }
+
+    // Test that adding a block from the 'custom blocks list' doesn't send you
+    // to the block configure form.
+    $this->drupalGet('admin/structure/block/block-content');
+    $this->clickLink(t('Add custom block'));
+    $this->clickLink('foo');
+    $edit = ['info[0][value]' => $this->randomMachineName(8)];
+    $this->drupalPostForm(NULL, $edit, t('Save'));
+    $blocks = $storage->loadByProperties(['info' => $edit['info[0][value]']]);
+    if (!empty($blocks)) {
+      $this->assertUrl(\Drupal::url('entity.block_content.collection', [], ['absolute' => TRUE]));
+    }
+    else {
+      $this->fail('Could not load created block.');
+    }
+  }
+
+}

core/modules/block_content/tests/src/Functional/Update/BlockContentUpdateTest.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Drupal\Tests\block_content\Functional\Update;
+
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
+
+/**
+ * Tests update functions for the Block Content module.
+ *
+ * @group Update
+ */
+class BlockContentUpdateTest extends UpdatePathTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setDatabaseDumpFiles() {
+    $this->databaseDumpFiles = [
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+    ];
+  }
+
+  /**
+   * Tests the revision metadata fields and revision data table additions.
+   */
+  public function testSimpleUpdates() {
+    $entity_definition_update_manager = \Drupal::entityDefinitionUpdateManager();
+    $entity_type = $entity_definition_update_manager->getEntityType('block_content');
+    $this->assertNull($entity_type->getRevisionDataTable());
+
+    $this->runUpdates();
+
+    $post_revision_created = $entity_definition_update_manager->getFieldStorageDefinition('revision_created', 'block_content');
+    $post_revision_user = $entity_definition_update_manager->getFieldStorageDefinition('revision_user', 'block_content');
+    $this->assertTrue($post_revision_created instanceof BaseFieldDefinition, "Revision created field found");
+    $this->assertTrue($post_revision_user instanceof BaseFieldDefinition, "Revision user field found");
+
+    $this->assertEqual('created', $post_revision_created->getType(), "Field is type created");
+    $this->assertEqual('entity_reference', $post_revision_user->getType(), "Field is type entity_reference");
+
+    $entity_type = $entity_definition_update_manager->getEntityType('block_content');
+    $this->assertEqual('block_content_field_revision', $entity_type->getRevisionDataTable());
+  }
+
+}

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

@@ -35,7 +35,7 @@ class MigrateBlockContentEntityFormDisplayTest extends MigrateDrupal7TestBase {
    *
    * @param string $id
    *   The entity ID.
-   * @param string $component
+   * @param string $component_id
    *   The ID of the form component.
    */
   protected function assertDisplay($id, $component_id) {

core/modules/block_content/tests/src/Unit/Menu/BlockContentLocalTasksTest.php

@@ -19,9 +19,9 @@ class BlockContentLocalTasksTest extends LocalTaskIntegrationTestBase {
     ];
     parent::setUp();
 
-    $config_factory = $this->getConfigFactoryStub(['system.theme' => [
-      'default' => 'test_c',
-    ]]);
+    $config_factory = $this->getConfigFactoryStub([
+      'system.theme' => ['default' => 'test_c'],
+    ]);
 
     $themes = [];
     $themes['test_a'] = (object) [