Stop asking for bundle in the field commands if the entity type isn't…

… able to have bundles
drush-ops · Jan 2, 2022 · 7d016bc · 7d016bc
1 parent 786948b
commit 7d016bc
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/Drupal/Commands/field/EntityTypeBundleAskTrait.php b/src/Drupal/Commands/field/EntityTypeBundleAskTrait.php
@@ -48,14 +48,15 @@ protected function askBundle(): ?string
         $bundleInfo = $this->entityTypeBundleInfo->getBundleInfo($entityTypeId);
         $choices = [];
 
-        if (empty($bundleInfo)) {
-            if ($bundleEntityType) {
-                throw new \InvalidArgumentException(
-                    t('Entity type with id \':entityType\' does not have any bundles.', [':entityType' => $entityTypeId])
-                );
-            }
+        if ($bundleEntityType && $bundleInfo === []) {
+            throw new \InvalidArgumentException(
+                t('Entity type with id \':entityType\' does not have any bundles.', [':entityType' => $entityTypeId])
+            );
+        }
 
-            return null;
+        if (!$bundleEntityType && count($bundleInfo) === 1) {
+            // eg. User
+            return $entityTypeId;
         }
 
         foreach ($bundleInfo as $bundle => $data) {