Issue #2728507 by Lendude, Kristen Pol, pameeela: Not selecting an en…

…tity type on Config import single leads to a fatal error (cherry picked from commit c976dbbfd31e986dd4dbc0fe9adea891ee1e8bd2)
drupal · Jul 20, 2020 · 5e79d23 · 5e79d23
1 parent c629cef
commit 5e79d23
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/modules/config/src/Form/ConfigSingleImportForm.php b/modules/config/src/Form/ConfigSingleImportForm.php
@@ -317,7 +317,7 @@ public function validateForm(array &$form, FormStateInterface $form_state) {
     }
 
     // Validate for config entities.
-    if ($form_state->getValue('config_type') !== 'system.simple') {
+    if ($form_state->getValue('config_type') && $form_state->getValue('config_type') !== 'system.simple') {
       $definition = $this->entityTypeManager->getDefinition($form_state->getValue('config_type'));
       $id_key = $definition->getKey('id');
 

diff --git a/modules/config/tests/src/Functional/ConfigSingleImportExportTest.php b/modules/config/tests/src/Functional/ConfigSingleImportExportTest.php
@@ -231,6 +231,10 @@ public function testImportSimpleConfiguration() {
     $this->drupalPostForm('admin/config/development/configuration/single/import', $edit, t('Import'));
     $this->assertText(t('Can not uninstall the Configuration module as part of a configuration synchronization through the user interface.'));
 
+    // Try to import without any values.
+    $this->drupalPostForm('admin/config/development/configuration/single/import', [], t('Import'));
+    $this->assertText('Configuration type field is required.');
+    $this->assertText('Paste your configuration here field is required.');
   }
 
   /**