From f501138bba8ad8417d85e77c7426893b88e1c89e Mon Sep 17 00:00:00 2001
From: xjm <xjm@65776.no-reply.drupal.org>
Date: Mon, 22 Jun 2020 09:47:10 -0500
Subject: [PATCH] Revert "Issue #3143316 by Lendude, sunset_bill, daffie, xjm,
 facine: "Getting the base fields is not supported for entity type" exception
 in ViewsConfigUpdater"

This reverts commit 15e0b54c86ee8b7cb96237d9b9219e9a34318b6b.
---
 core/modules/views/src/ViewsConfigUpdater.php |  3 +--
 .../views_config_entity_test.schema.yml       |  9 -------
 .../src/Entity/ViewsConfigEntityTest.php      | 26 ------------------
 .../src/ViewsConfigEntityTestViewsData.php    | 27 -------------------
 .../views_config_entity_test.info.yml         |  5 ----
 .../src/Kernel/ViewsConfigUpdaterTest.php     |  5 ----
 6 files changed, 1 insertion(+), 74 deletions(-)
 delete mode 100644 core/modules/views/tests/modules/views_config_entity_test/config/schema/views_config_entity_test.schema.yml
 delete mode 100644 core/modules/views/tests/modules/views_config_entity_test/src/Entity/ViewsConfigEntityTest.php
 delete mode 100644 core/modules/views/tests/modules/views_config_entity_test/src/ViewsConfigEntityTestViewsData.php
 delete mode 100644 core/modules/views/tests/modules/views_config_entity_test/views_config_entity_test.info.yml

diff --git a/core/modules/views/src/ViewsConfigUpdater.php b/core/modules/views/src/ViewsConfigUpdater.php
index 2555dbc97f..af3260405a 100644
--- a/core/modules/views/src/ViewsConfigUpdater.php
+++ b/core/modules/views/src/ViewsConfigUpdater.php
@@ -8,7 +8,6 @@
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Entity\Sql\DefaultTableMapping;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -286,7 +285,7 @@ protected function getMultivalueBaseFieldUpdateTableInfo() {
       $table_info = [];
 
       foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
-        if ($entity_type->hasHandlerClass('views_data') && $entity_type->entityClassImplements(FieldableEntityInterface::class)) {
+        if ($entity_type->hasHandlerClass('views_data')) {
           $base_field_definitions = $this->entityFieldManager->getBaseFieldDefinitions($entity_type_id);
 
           $entity_storage = $this->entityTypeManager->getStorage($entity_type_id);
diff --git a/core/modules/views/tests/modules/views_config_entity_test/config/schema/views_config_entity_test.schema.yml b/core/modules/views/tests/modules/views_config_entity_test/config/schema/views_config_entity_test.schema.yml
deleted file mode 100644
index 8ea57d8759..0000000000
--- a/core/modules/views/tests/modules/views_config_entity_test/config/schema/views_config_entity_test.schema.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-views_config_entity_test.type.*:
-  type: config_entity
-  label: 'Config entity type with Views data'
-  mapping:
-    id:
-      type: string
-    name:
-      type: label
-      label: 'Name'
diff --git a/core/modules/views/tests/modules/views_config_entity_test/src/Entity/ViewsConfigEntityTest.php b/core/modules/views/tests/modules/views_config_entity_test/src/Entity/ViewsConfigEntityTest.php
deleted file mode 100644
index 2649e76ad4..0000000000
--- a/core/modules/views/tests/modules/views_config_entity_test/src/Entity/ViewsConfigEntityTest.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Drupal\views_config_entity_test\Entity;
-
-use Drupal\Core\Config\Entity\ConfigEntityBase;
-
-/**
- * Defines a configuration-based entity type used for testing Views data.
- *
- * @ConfigEntityType(
- *   id = "views_config_entity_test",
- *   label = @Translation("Test config entity type with Views data"),
- *   handlers = {
- *     "list_builder" = "Drupal\Core\Entity\EntityListBuilder",
- *     "views_data" = "Drupal\views_config_entity_test\ViewsConfigEntityTestViewsData"
- *   },
- *   admin_permission = "administer modules",
- *   config_prefix = "type",
- *   entity_keys = {
- *     "id" = "id",
- *     "label" = "name"
- *   }
- * )
- */
-class ViewsConfigEntityTest extends ConfigEntityBase {
-}
diff --git a/core/modules/views/tests/modules/views_config_entity_test/src/ViewsConfigEntityTestViewsData.php b/core/modules/views/tests/modules/views_config_entity_test/src/ViewsConfigEntityTestViewsData.php
deleted file mode 100644
index 97138f1c40..0000000000
--- a/core/modules/views/tests/modules/views_config_entity_test/src/ViewsConfigEntityTestViewsData.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace Drupal\views_config_entity_test;
-
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\views\EntityViewsDataInterface;
-
-/**
- * Provides a view to override views data for config test entity types.
- */
-class ViewsConfigEntityTestViewsData implements EntityViewsDataInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getViewsData() {
-    return [];
-  }
-
-  /**
-   * @inheritDoc
-   */
-  public function getViewsTableForEntityType(EntityTypeInterface $entity_type) {
-    return 'views_config_entity_test';
-  }
-
-}
diff --git a/core/modules/views/tests/modules/views_config_entity_test/views_config_entity_test.info.yml b/core/modules/views/tests/modules/views_config_entity_test/views_config_entity_test.info.yml
deleted file mode 100644
index 95962a1262..0000000000
--- a/core/modules/views/tests/modules/views_config_entity_test/views_config_entity_test.info.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: 'views_config_entity_test'
-description: 'Adds a Config Entity with views data'
-type: module
-package: Testing
-version: VERSION
diff --git a/core/modules/views/tests/src/Kernel/ViewsConfigUpdaterTest.php b/core/modules/views/tests/src/Kernel/ViewsConfigUpdaterTest.php
index 002a8182e1..d17e60ac33 100644
--- a/core/modules/views/tests/src/Kernel/ViewsConfigUpdaterTest.php
+++ b/core/modules/views/tests/src/Kernel/ViewsConfigUpdaterTest.php
@@ -19,11 +19,6 @@ class ViewsConfigUpdaterTest extends ViewsKernelTestBase {
    */
   protected $configUpdater;
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $modules = ['views_config_entity_test'];
-
   /**
    * {@inheritdoc}
    */
-- 
GitLab