X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Fcore%2Flib%2FDrupal%2FCore%2FField%2FPlugin%2FField%2FFieldType%2FEntityReferenceItem.php;fp=web%2Fcore%2Flib%2FDrupal%2FCore%2FField%2FPlugin%2FField%2FFieldType%2FEntityReferenceItem.php;h=3d839c270976ee8e59de40c4b45b1b8d79ba598a;hb=af6d1fb995500ae68849458ee10d66abbdcfb252;hp=70f9dc9f452071c13cfe4b684162adb24182e455;hpb=680c79a86e3ed402f263faeac92e89fb6d9edcc0;p=yaffs-website

diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
index 70f9dc9f4..3d839c270 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
@@ -4,6 +4,7 @@ namespace Drupal\Core\Field\Plugin\Field\FieldType;
 
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Entity\ContentEntityStorageInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\FieldableEntityInterface;
@@ -296,6 +297,37 @@ class EntityReferenceItem extends FieldItemBase implements OptionsProviderInterf
       $values['target_id'] = array_rand($referenceable[$group]);
       return $values;
     }
+
+    // Attempt to create a sample entity, avoiding recursion.
+    $entity_storage = \Drupal::entityTypeManager()->getStorage($options['target_type']);
+    if ($options['target_type'] !== $field_definition->getTargetEntityTypeId() && $entity_storage instanceof ContentEntityStorageInterface) {
+      $bundle = static::getRandomBundle($entity_type, $options['handler_settings']);
+      $values['entity'] = $entity_storage->createWithSampleValues($bundle);
+      return $values;
+    }
+  }
+
+  /**
+   * Gets a bundle for a given entity type and selection options.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   * @param array $selection_settings
+   *   An array of selection settings.
+   *
+   * @return string|null
+   *   Either the bundle string, or NULL if there is no bundle.
+   */
+  protected static function getRandomBundle(EntityTypeInterface $entity_type, array $selection_settings) {
+    if ($bundle_key = $entity_type->getKey('bundle')) {
+      if (!empty($selection_settings['target_bundles'])) {
+        $bundle_ids = $selection_settings['target_bundles'];
+      }
+      else {
+        $bundle_ids = \Drupal::service('entity_type.bundle.info')->getBundleInfo($entity_type->id());
+      }
+      return array_rand($bundle_ids);
+    }
   }
 
   /**