updated core to 8.6.1 via composer

core/modules/block/tests/modules/block_test/block_test.info.yml

@@ -5,4 +5,4 @@ package: Testing
 version: VERSION
 core: 8.x
 dependencies:
-  - block
+  - drupal:block

core/modules/block/tests/modules/block_test/src/ContextProvider/MultipleStaticContext.php

@@ -4,9 +4,8 @@ namespace Drupal\block_test\ContextProvider;
 
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Plugin\Context\Context;
-use Drupal\Core\Plugin\Context\ContextDefinition;
 use Drupal\Core\Plugin\Context\ContextProviderInterface;
+use Drupal\Core\Plugin\Context\EntityContext;
 use Drupal\Core\Session\AccountInterface;
 
 /**
@@ -47,9 +46,8 @@ class MultipleStaticContext implements ContextProviderInterface {
   public function getRuntimeContexts(array $unqualified_context_ids) {
     $current_user = $this->userStorage->load($this->account->id());
 
-    $context1 = new Context(new ContextDefinition('entity:user', 'User A'), $current_user);
-
-    $context2 = new Context(new ContextDefinition('entity:user', 'User B'), $current_user);
+    $context1 = EntityContext::fromEntity($current_user, 'User A');
+    $context2 = EntityContext::fromEntity($current_user, 'User B');
 
     $cacheability = new CacheableMetadata();
     $cacheability->setCacheContexts(['user']);

core/modules/block/tests/modules/block_test/src/Controller/TestMultipleFormController.php

@@ -17,7 +17,8 @@ class TestMultipleFormController extends ControllerBase {
       'form2' => $this->formBuilder()->buildForm('\Drupal\block_test\Form\FavoriteAnimalTestForm', $form_state),
     ];
 
-    // Output all attached placeholders trough drupal_set_message(), so we can
+    // Output all attached placeholders trough
+    // \Drupal\Core\Messenger\MessengerInterface::addMessage(), so we can
     // see if there's only one in the tests.
     $post_render_callable = function ($elements) {
       $matches = [];
@@ -26,7 +27,7 @@ class TestMultipleFormController extends ControllerBase {
       $action_values = $matches[2];
 
       foreach ($action_values as $action_value) {
-        drupal_set_message('Form action: ' . $action_value);
+        $this->messenger()->addStatus('Form action: ' . $action_value);
       }
       return $elements;
     };

core/modules/block/tests/modules/block_test/src/Form/FavoriteAnimalTestForm.php

@@ -25,7 +25,7 @@ class FavoriteAnimalTestForm extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $form['favorite_animal'] = [
       '#type' => 'textfield',
-      '#title' => $this->t('Your favorite animal.')
+      '#title' => $this->t('Your favorite animal.'),
     ];
 
     $form['submit_animal'] = [
@@ -40,7 +40,7 @@ class FavoriteAnimalTestForm extends FormBase {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    drupal_set_message($this->t('Your favorite animal is: @favorite_animal', ['@favorite_animal' => $form['favorite_animal']['#value']]));
+    $this->messenger()->addStatus($this->t('Your favorite animal is: @favorite_animal', ['@favorite_animal' => $form['favorite_animal']['#value']]));
   }
 
 }

core/modules/block/tests/modules/block_test/src/Form/TestForm.php

@@ -25,7 +25,7 @@ class TestForm extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $form['email'] = [
       '#type' => 'email',
-      '#title' => $this->t('Your .com email address.')
+      '#title' => $this->t('Your .com email address.'),
     ];
 
     $form['show'] = [
@@ -49,7 +49,7 @@ class TestForm extends FormBase {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    drupal_set_message($this->t('Your email address is @email', ['@email' => $form['email']['#value']]));
+    $this->messenger()->addStatus($this->t('Your email address is @email', ['@email' => $form['email']['#value']]));
   }
 
 }

core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareBlock.php

@@ -37,7 +37,7 @@ class TestContextAwareBlock extends BlockBase {
    */
   protected function blockAccess(AccountInterface $account) {
     if ($this->getContextValue('user') instanceof UserInterface) {
-      drupal_set_message('User context found.');
+      $this->messenger()->addStatus('User context found.');
     }
 
     return parent::blockAccess($account);

core/modules/block/tests/modules/block_test_views/block_test_views.info.yml

@@ -5,5 +5,5 @@ package: Testing
 version: VERSION
 core: 8.x
 dependencies:
-  - block
-  - views
+  - drupal:block
+  - drupal:views

core/modules/block/tests/src/Functional/BlockHookOperationTest.php

@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\block\Functional;
 
-use Drupal\Component\Utility\Unicode;
 use Drupal\Tests\BrowserTestBase;
 
 /**
@@ -37,7 +36,7 @@ class BlockHookOperationTest extends BrowserTestBase {
   public function testBlockOperationAlter() {
     // Add a test block, any block will do.
     // Set the machine name so the test_operation link can be built later.
-    $block_id = Unicode::strtolower($this->randomMachineName(16));
+    $block_id = mb_strtolower($this->randomMachineName(16));
     $this->drupalPlaceBlock('system_powered_by_block', ['id' => $block_id]);
 
     // Get the Block listing.

core/modules/block/tests/src/Functional/BlockInstallTest.php

@@ -15,7 +15,7 @@ class BlockInstallTest extends BrowserTestBase {
     // Warm the page cache.
     $this->drupalGet('');
     $this->assertNoText('Powered by Drupal');
-    $this->assertNoCacheTag('config:block_list');
+    $this->assertSession()->responseHeaderNotContains('X-Drupal-Cache-Tags', 'config:block_list');
 
     // Install the block module, and place the "Powered by Drupal" block.
     $this->container->get('module_installer')->install(['block', 'shortcut']);

core/modules/block/tests/src/Functional/BlockLanguageCacheTest.php

@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\block\Functional;
 
-use Drupal\Component\Utility\Unicode;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\Tests\BrowserTestBase;
 
@@ -62,7 +61,7 @@ class BlockLanguageCacheTest extends BrowserTestBase {
 
     // Create a menu in the default language.
     $edit['label'] = $this->randomMachineName();
-    $edit['id'] = Unicode::strtolower($edit['label']);
+    $edit['id'] = mb_strtolower($edit['label']);
     $this->drupalPostForm('admin/structure/menu/add', $edit, t('Save'));
     $this->assertText(t('Menu @label has been added.', ['@label' => $edit['label']]));
 

core/modules/block/tests/src/Functional/BlockLanguageTest.php

@@ -164,7 +164,7 @@ class BlockLanguageTest extends BrowserTestBase {
 
     // Change visibility to now depend on content language for this block.
     $edit = [
-      'visibility[language][context_mapping][language]' => '@language.current_language_context:language_content'
+      'visibility[language][context_mapping][language]' => '@language.current_language_context:language_content',
     ];
     $this->drupalPostForm('admin/structure/block/manage/' . $block_id, $edit, t('Save block'));
 

core/modules/block/tests/src/Functional/BlockRenderOrderTest.php

@@ -63,7 +63,7 @@ class BlockRenderOrderTest extends BrowserTestBase {
     }
 
     $this->drupalGet('');
-    $test_content = $this->getRawContent('');
+    $test_content = $this->getSession()->getPage()->getContent();
 
     $controller = $this->container->get('entity_type.manager')->getStorage('block');
     foreach ($controller->loadMultiple() as $return_block) {

core/modules/block/tests/src/Functional/BlockTest.php

@@ -146,7 +146,7 @@ class BlockTest extends BlockTestBase {
       $block_name = 'system_powered_by_block';
       $add_url = Url::fromRoute('block.admin_add', [
         'plugin_id' => $block_name,
-        'theme' => $default_theme
+        'theme' => $default_theme,
       ]);
       $links = $this->xpath('//a[contains(@href, :href)]', [':href' => $add_url->toString()]);
       $this->assertEqual(1, count($links), 'Found one matching link.');
@@ -537,14 +537,14 @@ class BlockTest extends BlockTestBase {
 
     $this->assertEqual($block->getVisibility()['user_role']['roles'], [
       $role1->id() => $role1->id(),
-      $role2->id() => $role2->id()
+      $role2->id() => $role2->id(),
     ]);
 
     $role1->delete();
 
     $block = Block::load($block->id());
     $this->assertEqual($block->getVisibility()['user_role']['roles'], [
-      $role2->id() => $role2->id()
+      $role2->id() => $role2->id(),
     ]);
   }
 

core/modules/block/tests/src/Functional/Hal/BlockHalJsonAnonTest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\Tests\block\Functional\Hal;
+
+use Drupal\Tests\block\Functional\Rest\BlockResourceTestBase;
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+
+/**
+ * @group hal
+ */
+class BlockHalJsonAnonTest extends BlockResourceTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+}

core/modules/block/tests/src/Functional/Hal/BlockHalJsonBasicAuthTest.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\block\Functional\Hal;
+
+use Drupal\Tests\block\Functional\Rest\BlockResourceTestBase;
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+
+/**
+ * @group hal
+ */
+class BlockHalJsonBasicAuthTest extends BlockResourceTestBase {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal', 'basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}

core/modules/block/tests/src/Functional/Hal/BlockHalJsonCookieTest.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\block\Functional\Hal;
+
+use Drupal\Tests\block\Functional\Rest\BlockResourceTestBase;
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+
+/**
+ * @group hal
+ */
+class BlockHalJsonCookieTest extends BlockResourceTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}

core/modules/block/tests/src/Functional/Rest/BlockJsonAnonTest.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\Tests\block\Functional\Rest;
+
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class BlockJsonAnonTest extends BlockResourceTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+}

core/modules/block/tests/src/Functional/Rest/BlockJsonBasicAuthTest.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\Tests\block\Functional\Rest;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class BlockJsonBasicAuthTest extends BlockResourceTestBase {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}

core/modules/block/tests/src/Functional/Rest/BlockJsonCookieTest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\Tests\block\Functional\Rest;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class BlockJsonCookieTest extends BlockResourceTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}

core/modules/block/tests/src/Functional/Rest/BlockResourceTestBase.php

@@ -0,0 +1,159 @@
+<?php
+
+namespace Drupal\Tests\block\Functional\Rest;
+
+use Drupal\block\Entity\Block;
+use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+
+abstract class BlockResourceTestBase extends EntityResourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['block'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $entityTypeId = 'block';
+
+  /**
+   * @var \Drupal\block\BlockInterface
+   */
+  protected $entity;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpAuthorization($method) {
+    switch ($method) {
+      case 'GET':
+        $this->entity->setVisibilityConfig('user_role', [])->save();
+        break;
+      case 'POST':
+        $this->grantPermissionsToTestedRole(['administer blocks']);
+        break;
+      case 'PATCH':
+        $this->grantPermissionsToTestedRole(['administer blocks']);
+        break;
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function createEntity() {
+    $block = Block::create([
+      'plugin' => 'llama_block',
+      'region' => 'header',
+      'id' => 'llama',
+      'theme' => 'classy',
+    ]);
+    // All blocks can be viewed by the anonymous user by default. An interesting
+    // side effect of this is that any anonymous user is also able to read the
+    // corresponding block config entity via REST, even if an authentication
+    // provider is configured for the block config entity REST resource! In
+    // other words: Block entities do not distinguish between 'view' as in
+    // "render on a page" and 'view' as in "read the configuration".
+    // This prevents that.
+    // @todo Fix this in https://www.drupal.org/node/2820315.
+    $block->setVisibilityConfig('user_role', [
+      'id' => 'user_role',
+      'roles' => ['non-existing-role' => 'non-existing-role'],
+      'negate' => FALSE,
+      'context_mapping' => [
+        'user' => '@user.current_user_context:current_user',
+      ],
+    ]);
+    $block->save();
+
+    return $block;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedNormalizedEntity() {
+    $normalization = [
+      'uuid' => $this->entity->uuid(),
+      'id' => 'llama',
+      'weight' => NULL,
+      'langcode' => 'en',
+      'status' => TRUE,
+      'dependencies' => [
+        'theme' => [
+          'classy',
+        ],
+      ],
+      'theme' => 'classy',
+      'region' => 'header',
+      'provider' => NULL,
+      'plugin' => 'llama_block',
+      'settings' => [
+        'id' => 'broken',
+        'label' => '',
+        'provider' => 'core',
+        'label_display' => 'visible',
+      ],
+      'visibility' => [],
+    ];
+
+    return $normalization;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getNormalizedPostEntity() {
+    // @todo Update in https://www.drupal.org/node/2300677.
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedCacheContexts() {
+    // @see ::createEntity()
+    return ['url.site'];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedCacheTags() {
+    // Because the 'user.permissions' cache context is missing, the cache tag
+    // for the anonymous user role is never added automatically.
+    return array_values(array_diff(parent::getExpectedCacheTags(), ['config:user.role.anonymous']));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedUnauthorizedAccessMessage($method) {
+    if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
+      return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+
+    switch ($method) {
+      case 'GET':
+        return "You are not authorized to view this block entity.";
+      default:
+        return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedUnauthorizedAccessCacheability() {
+    // @see \Drupal\block\BlockAccessControlHandler::checkAccess()
+    return parent::getExpectedUnauthorizedAccessCacheability()
+      ->setCacheTags([
+        '4xx-response',
+        'config:block.block.llama',
+        'http_response',
+        static::$auth ? 'user:2' : 'user:0',
+      ])
+      ->setCacheContexts(['user.roles']);
+  }
+
+}

core/modules/block/tests/src/Functional/Rest/BlockXmlAnonTest.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Drupal\Tests\block\Functional\Rest;
+
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
+
+/**
+ * @group rest
+ */
+class BlockXmlAnonTest extends BlockResourceTestBase {
+
+  use AnonResourceTestTrait;
+  use XmlEntityNormalizationQuirksTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'xml';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'text/xml; charset=UTF-8';
+
+}

core/modules/block/tests/src/Functional/Rest/BlockXmlBasicAuthTest.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Drupal\Tests\block\Functional\Rest;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
+
+/**
+ * @group rest
+ */
+class BlockXmlBasicAuthTest extends BlockResourceTestBase {
+
+  use BasicAuthResourceTestTrait;
+  use XmlEntityNormalizationQuirksTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'xml';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'text/xml; charset=UTF-8';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}

core/modules/block/tests/src/Functional/Rest/BlockXmlCookieTest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Drupal\Tests\block\Functional\Rest;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
+
+/**
+ * @group rest
+ */
+class BlockXmlCookieTest extends BlockResourceTestBase {
+
+  use CookieResourceTestTrait;
+  use XmlEntityNormalizationQuirksTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'xml';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'text/xml; charset=UTF-8';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}

core/modules/block/tests/src/Functional/Update/BlockConditionMissingSchemaUpdateTest.php

@@ -10,6 +10,7 @@ use Drupal\FunctionalTests\Update\UpdatePathTestBase;
  * @see https://www.drupal.org/node/2811519
  *
  * @group Update
+ * @group legacy
  */
 class BlockConditionMissingSchemaUpdateTest extends UpdatePathTestBase {
 

core/modules/block/tests/src/Functional/Update/BlockContextMappingUpdateFilledTest.php

@@ -6,6 +6,7 @@ namespace Drupal\Tests\block\Functional\Update;
  * Runs BlockContextMappingUpdateTest with a dump filled with content.
  *
  * @group Update
+ * @group legacy
  */
 class BlockContextMappingUpdateFilledTest extends BlockContextMappingUpdateTest {
 

core/modules/block/tests/src/Functional/Update/BlockContextMappingUpdateTest.php

@@ -12,6 +12,7 @@ use Drupal\node\Entity\Node;
  * @see https://www.drupal.org/node/2354889
  *
  * @group Update
+ * @group legacy
  */
 class BlockContextMappingUpdateTest extends UpdatePathTestBase {
 

core/modules/block/tests/src/Functional/Update/BlockRemoveDisabledRegionUpdateTest.php

@@ -10,6 +10,7 @@ use Drupal\FunctionalTests\Update\UpdatePathTestBase;
  * @see https://www.drupal.org/node/2513534
  *
  * @group Update
+ * @group legacy
  */
 class BlockRemoveDisabledRegionUpdateTest extends UpdatePathTestBase {
 

core/modules/block/tests/src/FunctionalJavascript/BlockFilterTest.php

@@ -3,14 +3,14 @@
 namespace Drupal\Tests\block\FunctionalJavascript;
 
 use Behat\Mink\Element\NodeElement;
-use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
 
 /**
  * Tests the JavaScript functionality of the block add filter.
  *
  * @group block
  */
-class BlockFilterTest extends JavascriptTestBase {
+class BlockFilterTest extends WebDriverTestBase {
 
   /**
    * {@inheritdoc}

core/modules/block/tests/src/Kernel/BlockRebuildTest.php

@@ -47,7 +47,8 @@ class BlockRebuildTest extends KernelTestBase {
    */
   public function testRebuildNoBlocks() {
     block_rebuild();
-    $messages = drupal_get_messages();
+    $messages = \Drupal::messenger()->all();
+    \Drupal::messenger()->deleteAll();
     $this->assertEquals([], $messages);
   }
 
@@ -58,7 +59,8 @@ class BlockRebuildTest extends KernelTestBase {
     $this->placeBlock('system_powered_by_block', ['region' => 'content']);
 
     block_rebuild();
-    $messages = drupal_get_messages();
+    $messages = \Drupal::messenger()->all();
+    \Drupal::messenger()->deleteAll();
     $this->assertEquals([], $messages);
   }
 
@@ -89,7 +91,8 @@ class BlockRebuildTest extends KernelTestBase {
     $block1 = Block::load($block1->id());
     $block2 = Block::load($block2->id());
 
-    $messages = drupal_get_messages();
+    $messages = \Drupal::messenger()->all();
+    \Drupal::messenger()->deleteAll();
     $expected = ['warning' => [new TranslatableMarkup('The block %info was assigned to the invalid region %region and has been disabled.', ['%info' => $block1->id(), '%region' => 'INVALID'])]];
     $this->assertEquals($expected, $messages);
 

core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php

@@ -26,7 +26,7 @@ class BlockStorageUnitTest extends KernelTestBase {
   /**
    * The block storage.
    *
-   * @var \Drupal\Core\Config\Entity\ConfigEntityStorageInterface.
+   * @var \Drupal\Core\Config\Entity\ConfigEntityStorageInterface
    */
   protected $controller;
 

core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockContentTranslationTest.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Drupal\Tests\block\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Tests migration of i18n block translations.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateBlockContentTranslationTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'aggregator',
+    'book',
+    'block',
+    'comment',
+    'forum',
+    'views',
+    'block_content',
+    'content_translation',
+    'language',
+    'statistics',
+    'taxonomy',
+    // Required for translation migrations.
+    'migrate_drupal_multilingual',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(['block']);
+    $this->installConfig(['block_content']);
+    $this->installEntitySchema('block_content');
+
+    $this->executeMigrations([
+      'd6_filter_format',
+      'block_content_type',
+      'block_content_body_field',
+      'd6_custom_block',
+      'd6_user_role',
+      'd6_block',
+      'd6_block_translation',
+    ]);
+    block_rebuild();
+  }
+
+  /**
+   * Tests the migration of block title translation.
+   */
+  public function testBlockContentTranslation() {
+    /** @var \Drupal\language\ConfigurableLanguageManagerInterface $language_manager */
+    $language_manager = $this->container->get('language_manager');
+
+    $config = $language_manager->getLanguageConfigOverride('zu', 'block.block.user_1');
+    $this->assertSame('zu - Navigation', $config->get('settings.label'));
+  }
+
+}

core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php

@@ -116,9 +116,9 @@ class MigrateBlockTest extends MigrateDrupal6TestBase {
     $visibility = [];
     $settings = [
       'id' => 'system_menu_block',
-      'label' => '',
+      'label' => 'zu - Navigation',
       'provider' => 'system',
-      'label_display' => '0',
+      'label_display' => 'visible',
       'level' => 1,
       'depth' => 0,
     ];

core/modules/block/tests/src/Kernel/Plugin/migrate/source/BlockTest.php

@@ -87,7 +87,7 @@ class BlockTest extends MigrateSqlSourceTestBase {
         'schema_version' => '6055',
         'weight' => '0',
         'info' => 'a:0:{}',
-      ]
+      ],
     ];
 
     // The expected results.
@@ -104,7 +104,7 @@ class BlockTest extends MigrateSqlSourceTestBase {
         'pages' => '',
         'title' => 'Test Title 01',
         'cache' => -1,
-        'roles' => [2]
+        'roles' => [2],
       ],
       [
         'bid' => 2,
@@ -118,7 +118,7 @@ class BlockTest extends MigrateSqlSourceTestBase {
         'pages' => '<front>',
         'title' => 'Test Title 02',
         'cache' => -1,
-        'roles' => [2]
+        'roles' => [2],
       ],
     ];
     return $tests;

core/modules/block/tests/src/Kernel/Plugin/migrate/source/d6/BlockTranslationTest.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace Drupal\Tests\block\Kernel\Plugin\migrate\source\d6;
+
+use Drupal\Tests\block\Kernel\Plugin\migrate\source\BlockTest;
+
+/**
+ * Tests i18n block source plugin.
+ *
+ * @covers \Drupal\block\Plugin\migrate\source\d6\BlockTranslation
+ *
+ * @group content_translation
+ */
+class BlockTranslationTest extends BlockTest {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['block'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function providerSource() {
+    // Test data is the same as BlockTest, but with the addition of i18n_blocks.
+    $tests = parent::providerSource();
+
+    // The source data.
+    $tests[0]['source_data']['i18n_blocks'] = [
+      [
+        'ibid' => 1,
+        'module' => 'block',
+        'delta' => '1',
+        'type' => 0,
+        'language' => 'fr',
+      ],
+      [
+        'ibid' => 2,
+        'module' => 'block',
+        'delta' => '2',
+        'type' => 0,
+        'language' => 'zu',
+      ],
+    ];
+    $tests[0]['source_data']['variables'] = [
+      [
+        'name' => 'default_theme',
+        'value' => 's:7:"garland";',
+      ],
+    ];
+    // The expected results.
+    $tests[0]['expected_data'] = [
+      [
+        'bid' => 1,
+        'module' => 'block',
+        'delta' => '1',
+        'title' => 'Test Title 01',
+        'ibid' => 1,
+        'type' => '0',
+        'language' => 'fr',
+        'default_theme' => 'Garland',
+      ],
+      [
+        'bid' => 2,
+        'module' => 'block',
+        'delta' => '2',
+        'theme' => 'garland',
+        'title' => 'Test Title 02',
+        'ibid' => 2,
+        'type' => '0',
+        'language' => 'zu',
+        'default_theme' => 'Garland',
+      ],
+    ];
+
+    return $tests;
+  }
+
+}

core/modules/block/tests/src/Unit/BlockRepositoryTest.php

@@ -118,21 +118,21 @@ class BlockRepositoryTest extends UnitTestCase {
   public function providerBlocksConfig() {
     $blocks_config = [
       'block1' => [
-        AccessResult::allowed(), 'top', 0
+        AccessResult::allowed(), 'top', 0,
       ],
       // Test a block without access.
       'block2' => [
-        AccessResult::forbidden(), 'bottom', 0
+        AccessResult::forbidden(), 'bottom', 0,
       ],
       // Test some blocks in the same region with specific weight.
       'block4' => [
-        AccessResult::allowed(), 'bottom', 5
+        AccessResult::allowed(), 'bottom', 5,
       ],
       'block3' => [
-        AccessResult::allowed(), 'bottom', 5
+        AccessResult::allowed(), 'bottom', 5,
       ],
       'block5' => [
-        AccessResult::allowed(), 'bottom', -5
+        AccessResult::allowed(), 'bottom', -5,
       ],
     ];
 
@@ -142,7 +142,7 @@ class BlockRepositoryTest extends UnitTestCase {
         'top' => ['block1'],
         'center' => [],
         'bottom' => ['block5', 'block3', 'block4'],
-      ]
+      ],
     ];
     return $test_cases;
   }

core/modules/block/tests/src/Unit/Plugin/migrate/process/BlockVisibilityTest.php

@@ -4,6 +4,7 @@ namespace Drupal\Tests\block\Unit\Plugin\migrate\process;
 
 use Drupal\block\Plugin\migrate\process\BlockVisibility;
 use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\migrate\MigrateSkipRowException;
 use Drupal\migrate\Plugin\MigrateProcessInterface;
 use Drupal\Tests\migrate\Unit\process\MigrateProcessTestCase;
 
@@ -80,4 +81,22 @@ class BlockVisibilityTest extends MigrateProcessTestCase {
     $this->assertEmpty($transformed_value);
   }
 
+  /**
+   * @covers ::transform
+   */
+  public function testTransformException() {
+    $this->moduleHandler->moduleExists('php')->willReturn(FALSE);
+    $migration_plugin = $this->prophesize(MigrateProcessInterface::class);
+    $this->row = $this->getMockBuilder('Drupal\migrate\Row')
+      ->disableOriginalConstructor()
+      ->setMethods(['getSourceProperty'])
+      ->getMock();
+    $this->row->expects($this->exactly(2))
+      ->method('getSourceProperty')
+      ->willReturnMap([['bid', 99], ['module', 'foobar']]);
+    $this->plugin = new BlockVisibility(['skip_php' => TRUE], 'block_visibility_pages', [], $this->moduleHandler->reveal(), $migration_plugin->reveal());
+    $this->setExpectedException(MigrateSkipRowException::class, "The block with bid '99' from module 'foobar' will have no PHP or request_path visibility configuration.");
+    $this->plugin->transform([2, '<?php', []], $this->migrateExecutable, $this->row, 'destinationproperty');
+  }
+
 }