core/lib/Drupal/Core/Plugin/Context/ContextDefinition.php

@@ -242,6 +242,11 @@ public function setDefaultValue($default_value) {
    * {@inheritdoc}
    */
   public function getConstraints() {
+    // If the backwards compatibility layer is present, delegate to that.
+    if ($this->entityContextDefinition) {
+      return $this->entityContextDefinition->getConstraints();
+    }
+
     // @todo Apply defaults.
     return $this->constraints;
   }
@@ -250,6 +255,11 @@ public function getConstraints() {
    * {@inheritdoc}
    */
   public function getConstraint($constraint_name) {
+    // If the backwards compatibility layer is present, delegate to that.
+    if ($this->entityContextDefinition) {
+      return $this->entityContextDefinition->getConstraint($constraint_name);
+    }
+
     $constraints = $this->getConstraints();
     return isset($constraints[$constraint_name]) ? $constraints[$constraint_name] : NULL;
   }
@@ -258,6 +268,11 @@ public function getConstraint($constraint_name) {
    * {@inheritdoc}
    */
   public function setConstraints(array $constraints) {
+    // If the backwards compatibility layer is present, delegate to that.
+    if ($this->entityContextDefinition) {
+      $this->entityContextDefinition->setConstraint();
+    }
+
     $this->constraints = $constraints;
     return $this;
   }
@@ -266,6 +281,11 @@ public function setConstraints(array $constraints) {
    * {@inheritdoc}
    */
   public function addConstraint($constraint_name, $options = NULL) {
+    // If the backwards compatibility layer is present, delegate to that.
+    if ($this->entityContextDefinition) {
+      $this->entityContextDefinition->addConstraint($constraint_name, $options);
+    }
+
     $this->constraints[$constraint_name] = $options;
     return $this;
   }
@@ -408,6 +428,7 @@ private function initializeEntityContextDefinition() {
       ->setRequired($this->isRequired())
       ->setMultiple($this->isMultiple())
       ->setDescription($this->getDescription())
+      ->setConstraints($this->getConstraints())
       ->setDefaultValue($this->getDefaultValue());
   }
 

core/lib/Drupal/Core/Render/Element/StatusMessages.php

@@ -86,7 +86,6 @@ public static function renderMessages($type = NULL) {
       // Render the messages.
       $render = [
         '#theme' => 'status_messages',
-        // @todo Improve when https://www.drupal.org/node/2278383 lands.
         '#message_list' => $messages,
         '#status_headings' => [
           'status' => t('Status message'),

core/lib/Drupal/Core/Session/AccountInterface.php

@@ -76,10 +76,12 @@ public function isAnonymous();
    *   language if the user has no language preference.
    *
    * @return string
-   *   The language code that is preferred by the account. If the preferred
-   *   language is not set or is a language not configured anymore on the site,
-   *   the site default is returned or an empty string is returned (if
-   *   $fallback_to_default is FALSE).
+   *   Returned language code depends upon following:
+   *   - The user preferred language code is returned if set in the account.
+   *   - If the user has no preferred language and $fallback_to_default is TRUE
+   *     then the site default language code is returned.
+   *   - If the user has no preferred language and $fallback_to_default is FALSE
+   *     then empty string is returned.
    */
   public function getPreferredLangcode($fallback_to_default = TRUE);
 

core/misc/ajax.es6.js

@@ -1034,16 +1034,15 @@
   Drupal.theme.ajaxWrapperNewContent = ($newContent, ajax, response) => (
     (response.effect || ajax.effect) !== 'none' &&
     $newContent.filter(
-      i =>
-        !(
-          // We can not consider HTML comments or whitespace text as separate
-          // roots, since they do not cause visual regression with effect.
-          $newContent[i].nodeName === '#comment' ||
-          ($newContent[i].nodeName === '#text' && /^(\s|\n|\r)*$/.test($newContent[i].textContent))
-        ),
-    ).length > 1
-      ? Drupal.theme('ajaxWrapperMultipleRootElements', $newContent)
-      : $newContent
+      i => !(
+        // We can not consider HTML comments or whitespace text as separate
+        // roots, since they do not cause visual regression with effect.
+        $newContent[i].nodeName === '#comment' ||
+        ($newContent[i].nodeName === '#text' && /^(\s|\n|\r)*$/.test($newContent[i].textContent))
+      ),
+    ).length > 1 ?
+      Drupal.theme('ajaxWrapperMultipleRootElements', $newContent) :
+      $newContent
   );
 
   /**

core/misc/collapse.es6.js

@@ -17,7 +17,7 @@
     this.$node.data('details', this);
     // Expand details if there are errors inside, or if it contains an
     // element that is targeted by the URI fragment identifier.
-    const anchor = location.hash && location.hash !== '#' ? `, ${location.hash}` : '';
+    const anchor = window.location.hash && window.location.hash !== '#' ? `, ${window.location.hash}` : '';
     if (this.$node.find(`.error${anchor}`).length) {
       this.$node.attr('open', true);
     }

core/misc/collapse.js

@@ -10,7 +10,7 @@
     this.$node = $(node);
     this.$node.data('details', this);
 
-    var anchor = location.hash && location.hash !== '#' ? ', ' + location.hash : '';
+    var anchor = window.location.hash && window.location.hash !== '#' ? ', ' + window.location.hash : '';
     if (this.$node.find('.error' + anchor).length) {
       this.$node.attr('open', true);
     }

core/misc/displace.es6.js

@@ -122,6 +122,7 @@
       // If the element's offset data attribute exits
       // but is not a valid number then get the displacement
       // dimensions directly from the element.
+      // eslint-disable-next-line no-restricted-globals
       if (isNaN(displacement)) {
         displacement = getRawOffset(el, edge);
       }

core/misc/drupal.es6.js

@@ -434,14 +434,14 @@ window.Drupal = { behaviors: {}, locale: {} };
     // Always use browser-derived absolute URLs in the comparison, to avoid
     // attempts to break out of the base path using directory traversal.
     let absoluteUrl = Drupal.url.toAbsolute(url);
-    let protocol = location.protocol;
+    let { protocol } = window.location;
 
     // Consider URLs that match this site's base URL but use HTTPS instead of HTTP
     // as local as well.
     if (protocol === 'http:' && absoluteUrl.indexOf('https:') === 0) {
       protocol = 'https:';
     }
-    let baseUrl = `${protocol}//${location.host}${drupalSettings.path.baseUrl.slice(0, -1)}`;
+    let baseUrl = `${protocol}//${window.location.host}${drupalSettings.path.baseUrl.slice(0, -1)}`;
 
     // Decoding non-UTF-8 strings may throw an exception.
     try {

core/misc/drupal.js

@@ -135,12 +135,12 @@ window.Drupal = { behaviors: {}, locale: {} };
 
   Drupal.url.isLocal = function (url) {
     var absoluteUrl = Drupal.url.toAbsolute(url);
-    var protocol = location.protocol;
+    var protocol = window.location.protocol;
 
     if (protocol === 'http:' && absoluteUrl.indexOf('https:') === 0) {
       protocol = 'https:';
     }
-    var baseUrl = protocol + '//' + location.host + drupalSettings.path.baseUrl.slice(0, -1);
+    var baseUrl = protocol + '//' + window.location.host + drupalSettings.path.baseUrl.slice(0, -1);
 
     try {
       absoluteUrl = decodeURIComponent(absoluteUrl);

core/misc/form.es6.js

@@ -154,10 +154,11 @@
    *   Array of IDs for form fields.
    */
   function fieldsList(form) {
-    const $fieldList = $(form).find('[name]').map((index, element) =>
+    const $fieldList = $(form).find('[name]').map(
       // We use id to avoid name duplicates on radio fields and filter out
       // elements with a name but no id.
-      element.getAttribute('id'));
+      (index, element) => element.getAttribute('id'),
+    );
     // Return a true array.
     return $.makeArray($fieldList);
   }
@@ -270,7 +271,7 @@
       url = e.currentTarget.location ? e.currentTarget.location : e.currentTarget;
     }
     else {
-      url = location;
+      url = window.location;
     }
     const hash = url.hash.substr(1);
     if (hash) {

core/misc/form.js

@@ -130,7 +130,7 @@
     if (e.type === 'click') {
       url = e.currentTarget.location ? e.currentTarget.location : e.currentTarget;
     } else {
-      url = location;
+      url = window.location;
     }
     var hash = url.hash.substr(1);
     if (hash) {

core/misc/tabledrag.es6.js

@@ -702,8 +702,10 @@
         // Stop any current scrolling.
         clearInterval(self.scrollInterval);
         // Continue scrolling if the mouse has moved in the scroll direction.
-        if ((scrollAmount > 0 && self.rowObject.direction === 'down')
-          || (scrollAmount < 0 && self.rowObject.direction === 'up')) {
+        if (
+          (scrollAmount > 0 && self.rowObject.direction === 'down') ||
+          (scrollAmount < 0 && self.rowObject.direction === 'up')
+        ) {
           self.setScroll(scrollAmount);
         }
 
@@ -1129,8 +1131,10 @@
       self.checkScroll(self.currentPointerCoords.y);
       const aboveTable = self.scrollY > self.table.topY;
       const belowTable = self.scrollY + self.windowHeight < self.table.bottomY;
-      if ((scrollAmount > 0 && belowTable)
-        || (scrollAmount < 0 && aboveTable)) {
+      if (
+        (scrollAmount > 0 && belowTable) ||
+        (scrollAmount < 0 && aboveTable)
+      ) {
         window.scrollBy(0, scrollAmount);
       }
     }, this.scrollSettings.interval);

core/modules/aggregator/src/Plugin/views/argument/Fid.php

@@ -23,7 +23,7 @@ class Fid extends NumericArgument {
   protected $entityManager;
 
   /**
-   * Constructs a Drupal\Component\Plugin\PluginBase object.
+   * Constructs a \Drupal\aggregator\Plugin\views\argument\Fid object.
    *
    * @param array $configuration
    *   A configuration array containing information about the plugin instance.

core/modules/aggregator/src/Plugin/views/argument/Iid.php

@@ -23,7 +23,7 @@ class Iid extends NumericArgument {
   protected $entityManager;
 
   /**
-   * Constructs a Drupal\Component\Plugin\PluginBase object.
+   * Constructs a \Drupal\aggregator\Plugin\views\argument\Iid object.
    *
    * @param array $configuration
    *   A configuration array containing information about the plugin instance.

core/modules/block/js/block.es6.js

@@ -136,13 +136,17 @@
         // Calculate minimum weight.
         let weight = -Math.round(table.find('.draggable').length / 2);
         // Update the block weights.
-        table.find(`.region-${region}-message`).nextUntil('.region-title')
-          .find('select.block-weight').val(() =>
+        table
+          .find(`.region-${region}-message`)
+          .nextUntil('.region-title')
+          .find('select.block-weight')
+          .val(
             // Increment the weight before assigning it to prevent using the
             // absolute minimum available weight. This way we always have an
             // unused upper and lower bound, which makes manually setting the
             // weights easier for users who prefer to do it that way.
-            ++weight);
+            () => ++weight,
+          );
       }
 
       const table = $('#blocks');

core/modules/block/src/Plugin/migrate/process/BlockVisibility.php

@@ -115,7 +115,7 @@ public function transform($value, MigrateExecutableInterface $migrate_executable
         // anything else -- the block will simply have no PHP or request_path
         // visibility configuration.
         elseif ($this->skipPHP) {
-          throw new MigrateSkipRowException();
+          throw new MigrateSkipRowException(sprintf("The block with bid '%d' from module '%s' will have no PHP or request_path visibility configuration.", $row->getSourceProperty('bid'), $row->getSourceProperty('module'), $destination_property));
         }
       }
       else {

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

@@ -26,6 +26,8 @@ class MigrateBlockContentTranslationTest extends MigrateDrupal6TestBase {
     'language',
     'statistics',
     'taxonomy',
+    // Required for translation migrations.
+    'migrate_drupal_multilingual',
   ];
 
   /**

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

@@ -4,6 +4,7 @@
 
 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 @@ public function testTransformPhpDisabled() {
     $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');
+  }
+
 }

core/modules/block_content/block_content.install

@@ -138,3 +138,19 @@ function block_content_update_8400() {
     $definition_update_manager->uninstallFieldStorageDefinition($content_translation_status);
   }
 }
+
+/**
+ * Add 'reusable' field to 'block_content' entities.
+ */
+function block_content_update_8600() {
+  $reusable = BaseFieldDefinition::create('boolean')
+    ->setLabel(t('Reusable'))
+    ->setDescription(t('A boolean indicating whether this block is reusable.'))
+    ->setTranslatable(FALSE)
+    ->setRevisionable(FALSE)
+    ->setDefaultValue(TRUE)
+    ->setInitialValue(TRUE);
+
+  \Drupal::entityDefinitionUpdateManager()
+    ->installFieldStorageDefinition('reusable', 'block_content', 'block_content', $reusable);
+}

core/modules/block_content/block_content.module

@@ -8,6 +8,9 @@
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\Core\Database\Query\SelectInterface;
+use Drupal\Core\Database\Query\AlterableInterface;
+use Drupal\Core\Database\Query\ConditionInterface;
 
 /**
  * Implements hook_help().
@@ -105,3 +108,73 @@ function block_content_add_body_field($block_type_id, $label = 'Body') {
 
   return $field;
 }
+
+/**
+ * Implements hook_query_TAG_alter().
+ *
+ * Alters any 'entity_reference' query where the entity type is
+ * 'block_content' and the query has the tag 'block_content_access'.
+ *
+ * These queries should only return reusable blocks unless a condition on
+ * 'reusable' is explicitly set.
+ *
+ * Block_content entities that are reusable should by default not be selectable
+ * as entity reference values. A module can still create an instance of
+ * \Drupal\Core\Entity\EntityReferenceSelection\SelectionInterface
+ * that will allow selection of non-reusable blocks by explicitly setting
+ * a condition on the 'reusable' field.
+ *
+ * @see \Drupal\block_content\BlockContentAccessControlHandler
+ */
+function block_content_query_entity_reference_alter(AlterableInterface $query) {
+  if ($query instanceof SelectInterface && $query->getMetaData('entity_type') === 'block_content' && $query->hasTag('block_content_access')) {
+    $data_table = \Drupal::entityTypeManager()->getDefinition('block_content')->getDataTable();
+    if (array_key_exists($data_table, $query->getTables()) && !_block_content_has_reusable_condition($query->conditions(), $query->getTables())) {
+      $query->condition("$data_table.reusable", TRUE);
+    }
+  }
+}
+
+/**
+ * Utility function to find nested conditions using the reusable field.
+ *
+ * @todo Replace this function with a call to the API in
+ *   https://www.drupal.org/project/drupal/issues/2984930
+ *
+ * @param array $condition
+ *   The condition or condition group to check.
+ * @param array $tables
+ *   The tables from the related select query.
+ *
+ * @see \Drupal\Core\Database\Query\SelectInterface::getTables
+ *
+ * @return bool
+ *   Whether the conditions contain any condition using the reusable field.
+ */
+function _block_content_has_reusable_condition(array $condition, array $tables) {
+  // If this is a condition group call this function recursively for each nested
+  // condition until a condition is found that return TRUE.
+  if (isset($condition['#conjunction'])) {
+    foreach (array_filter($condition, 'is_array') as $nested_condition) {
+      if (_block_content_has_reusable_condition($nested_condition, $tables)) {
+        return TRUE;
+      }
+    }
+    return FALSE;
+  }
+  if (isset($condition['field'])) {
+    $field = $condition['field'];
+    if (is_object($field) && $field instanceof ConditionInterface) {
+      return _block_content_has_reusable_condition($field->conditions(), $tables);
+    }
+    $field_parts = explode('.', $field);
+    $data_table = \Drupal::entityTypeManager()->getDefinition('block_content')->getDataTable();
+    foreach ($tables as $table) {
+      if ($table['table'] === $data_table && $field_parts[0] === $table['alias'] && $field_parts[1] === 'reusable') {
+        return TRUE;
+      }
+    }
+
+  }
+  return FALSE;
+}