From c51fcdee75c4965dd12bff340452ea6ba8eb002e Mon Sep 17 00:00:00 2001
From: Daniel Wehner <daniel@tag1consulting.com>
Date: Wed, 2 Dec 2015 21:38:14 +0100
Subject: [PATCH] Rename entity_test module to avoid the conflict with the one
 from core

---
 tests/Kernel/EntityRevisionLogTraitTest.php                   | 2 +-
 .../entity_module_test.info.yml}                              | 0
 .../src/Entity/EntityWithRevisionLog.php                      | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename tests/modules/{entity_test/entity_test.info.yml => entity_module_test/entity_module_test.info.yml} (100%)
 rename tests/modules/{entity_test => entity_module_test}/src/Entity/EntityWithRevisionLog.php (90%)

diff --git a/tests/Kernel/EntityRevisionLogTraitTest.php b/tests/Kernel/EntityRevisionLogTraitTest.php
index 7ca16a0..ae0203d 100644
--- a/tests/Kernel/EntityRevisionLogTraitTest.php
+++ b/tests/Kernel/EntityRevisionLogTraitTest.php
@@ -19,7 +19,7 @@ class EntityRevisionLogTraitTest extends KernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['entity', 'entity_test', 'user', 'system'];
+  public static $modules = ['entity', 'entity_module_test', 'user', 'system'];
 
   /**
    * {@inheritdoc}
diff --git a/tests/modules/entity_test/entity_test.info.yml b/tests/modules/entity_module_test/entity_module_test.info.yml
similarity index 100%
rename from tests/modules/entity_test/entity_test.info.yml
rename to tests/modules/entity_module_test/entity_module_test.info.yml
diff --git a/tests/modules/entity_test/src/Entity/EntityWithRevisionLog.php b/tests/modules/entity_module_test/src/Entity/EntityWithRevisionLog.php
similarity index 90%
rename from tests/modules/entity_test/src/Entity/EntityWithRevisionLog.php
rename to tests/modules/entity_module_test/src/Entity/EntityWithRevisionLog.php
index 82db3c9..d44f34b 100644
--- a/tests/modules/entity_test/src/Entity/EntityWithRevisionLog.php
+++ b/tests/modules/entity_module_test/src/Entity/EntityWithRevisionLog.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\entity_test\Entity\EntityWithRevisionLog.
+ * Contains \Drupal\entity_module_test\Entity\EntityWithRevisionLog.
  */
 
-namespace Drupal\entity_test\Entity;
+namespace Drupal\entity_module_test\Entity;
 
 use Drupal\Core\Entity\ContentEntityBase;
 use Drupal\Core\Entity\EntityTypeInterface;
-- 
GitLab