From 1dbe6560f7abe7694bdd13ece4b1cf0c11b324ea Mon Sep 17 00:00:00 2001
From: Jonathan Hedstrom <jhedstrom@gmail.com>
Date: Wed, 1 Apr 2015 13:09:05 -0700
Subject: [PATCH] Merge pull request #160 from jhedstrom/simplify-travis

Remove custom php package installation

Signed-off-by: Jonathan Hedstrom <jhedstrom@gmail.com>
---
 .travis.yml                                              | 2 --
 .../install/field.field.user.user.field_user_tags.yml    | 9 ++++++++-
 .../install/field.storage.user.field_user_tags.yml       | 7 +------
 .../core.entity_view_display.user.user.default.yml       | 5 +++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 65b17815..3febee2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,6 @@ env:
 install:
   - composer self-update
   - composer install
-  - sudo apt-get update > /dev/null
-  - sudo apt-get --quiet=2 install php5-cli php5-cgi php5-curl php5-gd php5-mysql > /dev/null
   - composer global require drush/drush:dev-master --prefer-source
 
 before_script:
diff --git a/fixtures/drupal8/modules/behat_test/config/install/field.field.user.user.field_user_tags.yml b/fixtures/drupal8/modules/behat_test/config/install/field.field.user.user.field_user_tags.yml
index b39f64dc..992e1264 100644
--- a/fixtures/drupal8/modules/behat_test/config/install/field.field.user.user.field_user_tags.yml
+++ b/fixtures/drupal8/modules/behat_test/config/install/field.field.user.user.field_user_tags.yml
@@ -5,6 +5,7 @@ dependencies:
     - field.storage.user.field_user_tags
   module:
     - taxonomy
+    - entity_reference
 id: user.user.field_user_tags
 field_name: field_user_tags
 entity_type: user
@@ -17,4 +18,10 @@ default_value: {  }
 default_value_callback: ''
 settings:
   handler: default
-field_type: taxonomy_term_reference
+  handler_settings:
+    target_bundles:
+      tags: tags
+    sort:
+      field: _none
+    auto_create: true
+field_type: entity_reference
diff --git a/fixtures/drupal8/modules/behat_test/config/install/field.storage.user.field_user_tags.yml b/fixtures/drupal8/modules/behat_test/config/install/field.storage.user.field_user_tags.yml
index 4e8f76b8..b97065c5 100644
--- a/fixtures/drupal8/modules/behat_test/config/install/field.storage.user.field_user_tags.yml
+++ b/fixtures/drupal8/modules/behat_test/config/install/field.storage.user.field_user_tags.yml
@@ -7,12 +7,8 @@ dependencies:
 id: user.field_user_tags
 field_name: field_user_tags
 entity_type: user
-type: taxonomy_term_reference
+type: entity_reference
 settings:
-  allowed_values:
-    -
-      vocabulary: tags
-      parent: 0
   target_type: taxonomy_term
   options_list_callback: null
   target_bundle: null
@@ -20,5 +16,4 @@ module: taxonomy
 locked: false
 cardinality: -1
 translatable: true
-indexes: {  }
 persist_with_no_fields: false
diff --git a/fixtures/drupal8/modules/behat_test/override_config/core.entity_view_display.user.user.default.yml b/fixtures/drupal8/modules/behat_test/override_config/core.entity_view_display.user.user.default.yml
index 109f59b7..988c53ef 100644
--- a/fixtures/drupal8/modules/behat_test/override_config/core.entity_view_display.user.user.default.yml
+++ b/fixtures/drupal8/modules/behat_test/override_config/core.entity_view_display.user.user.default.yml
@@ -27,9 +27,10 @@ content:
     settings: {  }
     third_party_settings: {  }
   field_user_tags:
-    type: taxonomy_term_reference_link
+    type: entity_reference_label
     weight: 2
-    settings: {  }
+    settings:
+      link: true
     third_party_settings: {  }
     label: above
   field_user_reference: