Merge pull request #174 from jhedstrom/grasmash-expand-base-fields

Rebase: Adding expandEntityBaseFields() method.

.gitignore

@@ -1,3 +1,4 @@
+.idea
 *.tgz
 *.phar
 composer.lock

src/Drupal/Driver/Cores/AbstractCore.php

@@ -56,7 +56,7 @@ public function getRandom() {
   public function getFieldHandler($entity, $entity_type, $field_name) {
     $reflection = new \ReflectionClass($this);
     $core_namespace = $reflection->getShortName();
-    $field_types = $this->getEntityFieldTypes($entity_type);
+    $field_types = $this->getEntityFieldTypes($entity_type, array($field_name));
     $camelized_type = Container::camelize($field_types[$field_name]);
     $default_class = sprintf('\Drupal\Driver\Fields\%s\DefaultHandler', $core_namespace);
     $class_name = sprintf('\Drupal\Driver\Fields\%s\%sHandler', $core_namespace, $camelized_type);
@@ -73,9 +73,12 @@ public function getFieldHandler($entity, $entity_type, $field_name) {
    *   The entity type ID.
    * @param \stdClass $entity
    *   Entity object.
+   * @param array $base_fields
+   *   Optional. Define base fields that will be expanded in addition to user
+   *   defined fields.
    */
-  protected function expandEntityFields($entity_type, \stdClass $entity) {
-    $field_types = $this->getEntityFieldTypes($entity_type);
+  protected function expandEntityFields($entity_type, \stdClass $entity, array $base_fields = array()) {
+    $field_types = $this->getEntityFieldTypes($entity_type, $base_fields);
     foreach ($field_types as $field_name => $type) {
       if (isset($entity->$field_name)) {
         $entity->$field_name = $this->getFieldHandler($entity, $entity_type, $field_name)

src/Drupal/Driver/Cores/CoreInterface.php

@@ -164,11 +164,14 @@ public function isField($entity_type, $field_name);
    *
    * @param string $entity_type
    *   The entity type for which to return the field types.
+   * @param array $base_fields
+   *   Optional. Define base fields that will be returned in addition to user-
+   *   defined fields.
    *
    * @return array
    *   An associative array of field types, keyed by field name.
    */
-  public function getEntityFieldTypes($entity_type);
+  public function getEntityFieldTypes($entity_type, array $base_fields = array());
 
   /**
    * Creates a language.

src/Drupal/Driver/Cores/Drupal6.php

@@ -432,7 +432,14 @@ public function getExtensionPathList() {
   /**
    * {@inheritdoc}
    */
-  public function getEntityFieldTypes($entity_type) {
+  protected function expandEntityFields($entity_type, \stdClass $entity, array $base_fields = array()) {
+    return parent::expandEntityFields($entity_type, $entity);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getEntityFieldTypes($entity_type, array $base_fields = array()) {
     $taxonomy_fields = array('taxonomy' => 'taxonomy');
     if (!module_exists('content')) {
       return $taxonomy_fields;

src/Drupal/Driver/Cores/Drupal7.php

@@ -456,7 +456,7 @@ public function getExtensionPathList() {
   /**
    * {@inheritdoc}
    */
-  public function getEntityFieldTypes($entity_type) {
+  public function getEntityFieldTypes($entity_type, array $base_fields = array()) {
     $return = array();
     $fields = field_info_field_map();
     foreach ($fields as $field_name => $field) {

src/Drupal/Driver/Cores/Drupal8.php

@@ -3,6 +3,7 @@
 namespace Drupal\Driver\Cores;
 
 use Drupal\Core\DrupalKernel;
+use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Driver\Exception\BootstrapException;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\language\Entity\ConfigurableLanguage;
@@ -357,14 +358,29 @@ public function getExtensionPathList() {
     return $paths;
   }
 
+  /**
+   * Expands specified base fields on the entity object.
+   *
+   * @param string $entity_type
+   *   The entity type for which to return the field types.
+   * @param \stdClass $entity
+   *   Entity object.
+   * @param array $base_fields
+   *   Base fields to be expanded in addition to user defined fields.
+   */
+  public function expandEntityBaseFields($entity_type, \stdClass $entity, array $base_fields) {
+    $this->expandEntityFields($entity_type, $entity, $base_fields);
+  }
+
   /**
    * {@inheritdoc}
    */
-  public function getEntityFieldTypes($entity_type) {
+  public function getEntityFieldTypes($entity_type, array $base_fields = array()) {
     $return = array();
     $fields = \Drupal::entityManager()->getFieldStorageDefinitions($entity_type);
     foreach ($fields as $field_name => $field) {
-      if ($this->isField($entity_type, $field_name)) {
+      if ($this->isField($entity_type, $field_name)
+        || (in_array($field_name, $base_fields) && $this->isBaseField($entity_type, $field_name))) {
         $return[$field_name] = $field->getType();
       }
     }
@@ -379,6 +395,14 @@ public function isField($entity_type, $field_name) {
     return (isset($fields[$field_name]) && $fields[$field_name] instanceof FieldStorageConfig);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function isBaseField($entity_type, $field_name) {
+    $fields = \Drupal::entityManager()->getFieldStorageDefinitions($entity_type);
+    return (isset($fields[$field_name]) && $fields[$field_name] instanceof BaseFieldDefinition);
+  }
+
   /**
    * {@inheritdoc}
    */

src/Drupal/Driver/Fields/Drupal8/EntityReferenceHandler.php

@@ -24,13 +24,17 @@ public function expand($values) {
       $label_key = 'name';
     }
 
+    if (!$label_key && $entity_type_id == 'user') {
+      $label_key = 'name';
+    }
+
     // Determine target bundle restrictions.
     $target_bundle_key = NULL;
     if ($target_bundles = $this->getTargetBundles()) {
       $target_bundle_key = $entity_definition->getKey('bundle');
     }
 
-    foreach ($values as $value) {
+    foreach ((array) $values as $value) {
       $query = \Drupal::entityQuery($entity_type_id)->condition($label_key, $value);
       $query->accessCheck(FALSE);
       if ($target_bundles && $target_bundle_key) {