use both trait conditionnaly EntityReferenceTestTrait and EntityRefer…

…enceFieldCreationTrait for Drupal 10 & 11 compliances
antistatique · Jul 31, 2024 · 0057c3e · 0057c3e
1 parent eb56639
commit 0057c3e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - add getRequestStack & getTitleResolver to TwigExtensionBase
 - improve type-hinting using RevisionableStorageInterface for Loader::loadEntityRevision && Render::renderEntityRevision
 - remove usage of deprecated twig_date_converter function when Twig 3.9 is installed
+- use both trait conditionnaly EntityReferenceTestTrait and EntityReferenceFieldCreationTrait for Drupal 10 & 11 compliances
 
 ### Fixed
 - fix tests running on 10.3-dev with rendered webp image

diff --git a/tests/src/Functional/BambooTwigTestBase.php b/tests/src/Functional/BambooTwigTestBase.php
@@ -5,13 +5,19 @@
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\Tests\BrowserTestBase;
-use Drupal\Tests\field\Traits\EntityReferenceTestTrait;
+use Drupal\Tests\field\Traits\EntityReferenceFieldCreationTrait;
+
+// Workaround to support tests against both Drupal 10.1 and Drupal 11.0.
+// @todo Remove once we depend on Drupal 10.2.
+if (!trait_exists(EntityReferenceFieldCreationTrait::class)) {
+  class_alias('\Drupal\Tests\field\Traits\EntityReferenceTestTrait', EntityReferenceFieldCreationTrait::class);
+}
 
 /**
  * Has some additional helper methods to make test code more readable.
  */
 abstract class BambooTwigTestBase extends BrowserTestBase {
-  use EntityReferenceTestTrait;
+  use EntityReferenceFieldCreationTrait;
 
   /**
    * The Entity Type Manager.