diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php index e9e684a..7926623 100644 --- a/core/lib/Drupal/Core/DrupalKernel.php +++ b/core/lib/Drupal/Core/DrupalKernel.php @@ -897,8 +897,8 @@ protected function initializeContainer() { $container = new $class($container_definition); } - // If the class loader is still the as before including settings.php use - // an optimised classloader if possible. + // If the class loader is still the same as before including settings.php + // use an optimised classloader if possible. if ($this->preSettingsClassLoaderClass == get_class($this->classLoader) && Settings::get('class_loader_auto_detect', TRUE)) { $prefix = Settings::getApcuPrefix('class_loader', $this->root); diff --git a/core/modules/config/src/Tests/ConfigImportAllTest.php b/core/modules/config/src/Tests/ConfigImportAllTest.php index bba40f3..baeacb9 100644 --- a/core/modules/config/src/Tests/ConfigImportAllTest.php +++ b/core/modules/config/src/Tests/ConfigImportAllTest.php @@ -144,12 +144,6 @@ public function testInstallUninstall() { $this->container->get('config.storage'), $this->container->get('config.manager') ); - $changelist = $storage_comparer->createChangelist()->getChangelist(); - foreach ($changelist['update'] as $config_name) { - $diff = \Drupal::service('config.manager')->diff($this->container->get('config.storage'), $this->container->get('config.storage.sync'), $config_name); - // This will fail... but then we get to see the differences. - $this->assertEqual('', $this->container->get('diff.formatter')->format($diff)); - } $this->assertIdentical($storage_comparer->createChangelist()->getChangelist(), $storage_comparer->getEmptyChangelist()); // Now we have all configuration imported, test all of them for schema diff --git a/core/modules/config_translation/src/Form/ConfigTranslationFormBase.php b/core/modules/config_translation/src/Form/ConfigTranslationFormBase.php index 8aae6e2..aa31a33 100644 --- a/core/modules/config_translation/src/Form/ConfigTranslationFormBase.php +++ b/core/modules/config_translation/src/Form/ConfigTranslationFormBase.php @@ -199,11 +199,6 @@ public function submitForm(array &$form, FormStateInterface $form_state) { foreach ($this->mapper->getConfigNames() as $name) { - // Skip the config if it does not have translatable data. - if (!isset($form_values[$name])) { - continue; - } - $schema = $this->typedConfigManager->get($name); // Set configuration values based on form submission and source values. diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php index 2e15209..1f2b085 100644 --- a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php +++ b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php @@ -765,40 +765,6 @@ public function testFieldConfigTranslation() { } /** - * Tests field translation for node fields. - */ - public function testNodeFieldTranslation() { - NodeType::create(['type' => 'article', 'name' => 'Article'])->save(); - - $field_name = 'translatable_field'; - $field_storage = FieldStorageConfig::create([ - 'field_name' => $field_name, - 'entity_type' => 'node', - 'type' => 'text', - ]); - - $field_storage->setSetting('translatable_storage_setting', 'translatable_storage_setting'); - $field_storage->save(); - $field = FieldConfig::create([ - 'field_name' => $field_name, - 'entity_type' => 'node', - 'bundle' => 'article', - ]); - $field->save(); - - $this->drupalLogin($this->translatorUser); - - $this->drupalGet("/entity_test/structure/article/fields/node.article.$field_name/translate"); - $this->clickLink('Add'); - - $form_values = [ - 'translation[config_names][field.field.node.article.translatable_field][description]' => 'FR Help text.', - 'translation[config_names][field.field.node.article.translatable_field][label]' => 'FR label', - ]; - $this->drupalPostForm(NULL, $form_values, 'Save translation'); - } - - /** * Tests the translation of a boolean field settings. */ public function testBooleanFieldConfigTranslation() {