updated core to 8.6.3

This commit is contained in:
2018-11-21 12:49:46 +01:00
parent 8ca34853a3
commit c92c348eee
521 changed files with 12199 additions and 4578 deletions
@@ -216,7 +216,7 @@ class Migration extends PluginBase implements MigrationInterface, RequirementsIn
protected $sourcePluginManager;
/**
* Thep process plugin manager.
* The process plugin manager.
*
* @var \Drupal\migrate\Plugin\MigratePluginManager
*/
@@ -268,7 +268,7 @@ class EntityConfigBase extends Entity {
// The entity id does not include the langcode.
$id_values = [];
foreach ($destination_identifier as $key => $value) {
if ($this->isTranslationDestination() && $key == 'langcode') {
if ($this->isTranslationDestination() && $key === 'langcode') {
continue;
}
$id_values[] = $value;
@@ -58,6 +58,10 @@ class EntityFieldStorageConfig extends EntityConfigBase {
public function getIds() {
$ids['entity_type']['type'] = 'string';
$ids['field_name']['type'] = 'string';
// @todo: Remove conditional. https://www.drupal.org/node/3004574
if ($this->isTranslationDestination()) {
$ids['langcode']['type'] = 'string';
}
return $ids;
}
@@ -65,8 +69,18 @@ class EntityFieldStorageConfig extends EntityConfigBase {
* {@inheritdoc}
*/
public function rollback(array $destination_identifier) {
$destination_identifier = implode('.', $destination_identifier);
parent::rollback([$destination_identifier]);
if ($this->isTranslationDestination()) {
$language = $destination_identifier['langcode'];
unset($destination_identifier['langcode']);
$destination_identifier = [
implode('.', $destination_identifier),
'langcode' => $language,
];
}
else {
$destination_identifier = [implode('.', $destination_identifier)];
}
parent::rollback($destination_identifier);
}
}
@@ -238,7 +238,7 @@ class MigrationLookup extends ProcessPluginBase implements ContainerFactoryPlugi
/**
* Skips the migration process entirely if the value is FALSE.
*
* @param mixed $value
* @param array $value
* The incoming value to transform.
*
* @throws \Drupal\migrate\MigrateSkipProcessException
@@ -16,7 +16,7 @@ trait DummyQueryTrait {
* {@inheritdoc}
*/
public function query() {
// Pass an arbritrary table name - the query should never be executed
// Pass an arbitrary table name - the query should never be executed
// anyway.
$query = $this->select(uniqid(), 's')
->range(0, 1);