From 2e8a9b4e1c83986315a73f39e19576dee0f81d6c Mon Sep 17 00:00:00 2001 From: Alberto Paderno <22536-apaderno@users.noreply.drupalcode.org> Date: Tue, 30 Jan 2024 17:44:24 +0000 Subject: [PATCH 1/4] Issue #3417699: Tests failing on Drupal 10 because Tests module has same name as Test Theme --- .../bamboo_twig_theme_test.info.yml} | 2 +- .../templates/bamboo_twig/config.html.twig | 0 .../templates/bamboo_twig/extensions.html.twig | 0 .../templates/bamboo_twig/file.html.twig | 0 .../templates/bamboo_twig/i18n.html.twig | 0 .../templates/bamboo_twig/loader.html.twig | 0 .../templates/bamboo_twig/loader_revision.html.twig | 0 .../templates/bamboo_twig/path.html.twig | 0 .../templates/bamboo_twig/render.html.twig | 0 .../templates/bamboo_twig/render_revision.html.twig | 0 .../templates/bamboo_twig/security.html.twig | 0 .../templates/bamboo_twig/token.html.twig | 0 .../templates/content/node--article--full.html.twig | 0 .../templates/content/node--page--full.html.twig | 0 14 files changed, 1 insertion(+), 1 deletion(-) rename tests/themes/{bamboo_twig_test/bamboo_twig_test.info.yml => bamboo_twig_theme_test/bamboo_twig_theme_test.info.yml} (79%) rename tests/themes/{bamboo_twig_test => bamboo_twig_theme_test}/templates/bamboo_twig/config.html.twig (100%) rename tests/themes/{bamboo_twig_test => bamboo_twig_theme_test}/templates/bamboo_twig/extensions.html.twig (100%) rename tests/themes/{bamboo_twig_test => bamboo_twig_theme_test}/templates/bamboo_twig/file.html.twig (100%) rename tests/themes/{bamboo_twig_test => bamboo_twig_theme_test}/templates/bamboo_twig/i18n.html.twig (100%) rename tests/themes/{bamboo_twig_test => bamboo_twig_theme_test}/templates/bamboo_twig/loader.html.twig (100%) rename tests/themes/{bamboo_twig_test => bamboo_twig_theme_test}/templates/bamboo_twig/loader_revision.html.twig (100%) rename tests/themes/{bamboo_twig_test => bamboo_twig_theme_test}/templates/bamboo_twig/path.html.twig (100%) rename tests/themes/{bamboo_twig_test => bamboo_twig_theme_test}/templates/bamboo_twig/render.html.twig (100%) rename tests/themes/{bamboo_twig_test => bamboo_twig_theme_test}/templates/bamboo_twig/render_revision.html.twig (100%) rename tests/themes/{bamboo_twig_test => bamboo_twig_theme_test}/templates/bamboo_twig/security.html.twig (100%) rename tests/themes/{bamboo_twig_test => bamboo_twig_theme_test}/templates/bamboo_twig/token.html.twig (100%) rename tests/themes/{bamboo_twig_test => bamboo_twig_theme_test}/templates/content/node--article--full.html.twig (100%) rename tests/themes/{bamboo_twig_test => bamboo_twig_theme_test}/templates/content/node--page--full.html.twig (100%) diff --git a/tests/themes/bamboo_twig_test/bamboo_twig_test.info.yml b/tests/themes/bamboo_twig_theme_test/bamboo_twig_theme_test.info.yml similarity index 79% rename from tests/themes/bamboo_twig_test/bamboo_twig_test.info.yml rename to tests/themes/bamboo_twig_theme_test/bamboo_twig_theme_test.info.yml index c97655c..88c3db0 100644 --- a/tests/themes/bamboo_twig_test/bamboo_twig_test.info.yml +++ b/tests/themes/bamboo_twig_theme_test/bamboo_twig_theme_test.info.yml @@ -1,4 +1,4 @@ -name: Bamboo Twig Test +name: Bamboo Twig Theme Test type: theme description: The Official Theme for Bamboo Twig Tests base theme: starterkit_theme diff --git a/tests/themes/bamboo_twig_test/templates/bamboo_twig/config.html.twig b/tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/config.html.twig similarity index 100% rename from tests/themes/bamboo_twig_test/templates/bamboo_twig/config.html.twig rename to tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/config.html.twig diff --git a/tests/themes/bamboo_twig_test/templates/bamboo_twig/extensions.html.twig b/tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/extensions.html.twig similarity index 100% rename from tests/themes/bamboo_twig_test/templates/bamboo_twig/extensions.html.twig rename to tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/extensions.html.twig diff --git a/tests/themes/bamboo_twig_test/templates/bamboo_twig/file.html.twig b/tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/file.html.twig similarity index 100% rename from tests/themes/bamboo_twig_test/templates/bamboo_twig/file.html.twig rename to tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/file.html.twig diff --git a/tests/themes/bamboo_twig_test/templates/bamboo_twig/i18n.html.twig b/tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/i18n.html.twig similarity index 100% rename from tests/themes/bamboo_twig_test/templates/bamboo_twig/i18n.html.twig rename to tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/i18n.html.twig diff --git a/tests/themes/bamboo_twig_test/templates/bamboo_twig/loader.html.twig b/tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/loader.html.twig similarity index 100% rename from tests/themes/bamboo_twig_test/templates/bamboo_twig/loader.html.twig rename to tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/loader.html.twig diff --git a/tests/themes/bamboo_twig_test/templates/bamboo_twig/loader_revision.html.twig b/tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/loader_revision.html.twig similarity index 100% rename from tests/themes/bamboo_twig_test/templates/bamboo_twig/loader_revision.html.twig rename to tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/loader_revision.html.twig diff --git a/tests/themes/bamboo_twig_test/templates/bamboo_twig/path.html.twig b/tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/path.html.twig similarity index 100% rename from tests/themes/bamboo_twig_test/templates/bamboo_twig/path.html.twig rename to tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/path.html.twig diff --git a/tests/themes/bamboo_twig_test/templates/bamboo_twig/render.html.twig b/tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/render.html.twig similarity index 100% rename from tests/themes/bamboo_twig_test/templates/bamboo_twig/render.html.twig rename to tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/render.html.twig diff --git a/tests/themes/bamboo_twig_test/templates/bamboo_twig/render_revision.html.twig b/tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/render_revision.html.twig similarity index 100% rename from tests/themes/bamboo_twig_test/templates/bamboo_twig/render_revision.html.twig rename to tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/render_revision.html.twig diff --git a/tests/themes/bamboo_twig_test/templates/bamboo_twig/security.html.twig b/tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/security.html.twig similarity index 100% rename from tests/themes/bamboo_twig_test/templates/bamboo_twig/security.html.twig rename to tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/security.html.twig diff --git a/tests/themes/bamboo_twig_test/templates/bamboo_twig/token.html.twig b/tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/token.html.twig similarity index 100% rename from tests/themes/bamboo_twig_test/templates/bamboo_twig/token.html.twig rename to tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/token.html.twig diff --git a/tests/themes/bamboo_twig_test/templates/content/node--article--full.html.twig b/tests/themes/bamboo_twig_theme_test/templates/content/node--article--full.html.twig similarity index 100% rename from tests/themes/bamboo_twig_test/templates/content/node--article--full.html.twig rename to tests/themes/bamboo_twig_theme_test/templates/content/node--article--full.html.twig diff --git a/tests/themes/bamboo_twig_test/templates/content/node--page--full.html.twig b/tests/themes/bamboo_twig_theme_test/templates/content/node--page--full.html.twig similarity index 100% rename from tests/themes/bamboo_twig_test/templates/content/node--page--full.html.twig rename to tests/themes/bamboo_twig_theme_test/templates/content/node--page--full.html.twig From cba6666d9e2f0f648e53ce4f591547a116de9095 Mon Sep 17 00:00:00 2001 From: Alberto Paderno <22536-apaderno@users.noreply.drupalcode.org> Date: Tue, 30 Jan 2024 18:49:34 +0000 Subject: [PATCH 2/4] Corrected the value of BrowserTestBase::$defaultTheme --- tests/src/Functional/BambooTwigTestBase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/src/Functional/BambooTwigTestBase.php b/tests/src/Functional/BambooTwigTestBase.php index d72c919..efeb9a2 100644 --- a/tests/src/Functional/BambooTwigTestBase.php +++ b/tests/src/Functional/BambooTwigTestBase.php @@ -51,7 +51,7 @@ abstract class BambooTwigTestBase extends BrowserTestBase { /** * {@inheritdoc} */ - protected $defaultTheme = 'bamboo_twig_test'; + protected $defaultTheme = 'bamboo_twig_theme_test'; /** * {@inheritdoc} From 24c0a67c4d80b146c801b84cfe8023a6b8aff242 Mon Sep 17 00:00:00 2001 From: Kevin Wenger Date: Tue, 20 Feb 2024 09:40:39 +0100 Subject: [PATCH 3/4] add Drupal GitlabCI --- .gitlab-ci.yml | 47 +++++++++++++++++++++++++++++++++++++++++++++++ CHANGELOG.md | 1 + 2 files changed, 48 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..9e884ad --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,47 @@ +################ +# Includes +# +# Additional configuration can be provided through includes. +# One advantage of include files is that if they are updated upstream, the changes affect all pipelines using that include. +# +# Includes can be overridden by re-declaring anything provided in an include, here in gitlab-ci.yml +# https://docs.gitlab.com/ee/ci/yaml/includes.html#override-included-configuration-values +################ + +include: + ################ + # DrupalCI includes: + # As long as you include this, any future includes added by the Drupal Association will be accessible to your pipelines automatically. + # View these include files at https://git.drupalcode.org/project/gitlab_templates/ + ################ + - project: $_GITLAB_TEMPLATES_REPO + ref: $_GITLAB_TEMPLATES_REF + file: + - '/includes/include.drupalci.main.yml' + - '/includes/include.drupalci.variables.yml' + - '/includes/include.drupalci.workflows.yml' + +################ +# Pipeline configuration variables +# +# These are the variables provided to the Run Pipeline form that a user may want to override. +# +# Docs at https://git.drupalcode.org/project/gitlab_templates/-/blob/1.0.x/includes/include.drupalci.variables.yml +################ +variables: + SKIP_ESLINT: '1' + # Opt in to testing current minor against max supported PHP version. + OPT_IN_TEST_MAX_PHP: '1' + # Opt in to testing previous & next minor (Drupal 10.0.x and 10.2.x). + OPT_IN_TEST_PREVIOUS_MINOR: '1' + OPT_IN_TEST_NEXT_MINOR: '1' + # Opt in to testing $CORE_PREVIOUS_MAJOR (currently Drupal 9.5). + OPT_IN_TEST_PREVIOUS_MAJOR: '1' + # The 4.x branch of the CDN module requires PHP >=8.1, rather than core's >=7.4. + CORE_PREVIOUS_PHP_MIN: '8.1' + # Opt in to testing $CORE_MAJOR_DEVELOPMENT (currently Drupal 11). + OPT_IN_TEST_NEXT_MAJOR: '1' + +# This module wants to strictly comply with Drupal's coding standards. +phpcs: + allow_failure: false diff --git a/CHANGELOG.md b/CHANGELOG.md index 6eafbfd..9e723d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - add `bamboo_render_entity_revision` rendering of entity revision - Issue #3254160 by dibix, wengerk - add `bamboo_load_entity_revision` loading of entity revision - Issue #3254160 by dibix, wengerk - add support of optional `alt` parameter on `bamboo_render_image` - Issue #3355084 by Ranjit1032002, thatlotnextdoor, wengerk +- add Drupal GitlabCI ## [6.0.0] - 2022-11-18 ### Added From e5c5a0a828aa13d3e695831d2aaa788b77507041 Mon Sep 17 00:00:00 2001 From: Kevin Wenger Date: Tue, 20 Feb 2024 10:30:19 +0100 Subject: [PATCH 4/4] fix phpcs use statements should be sorted alphabetically --- bamboo_twig_config/src/TwigExtension/Config.php | 2 +- bamboo_twig_extensions/src/TwigExtension/TwigArray.php | 2 +- bamboo_twig_extensions/src/TwigExtension/TwigDate.php | 4 ++-- bamboo_twig_extensions/src/TwigExtension/TwigText.php | 2 +- bamboo_twig_file/src/TwigExtension/File.php | 4 ++-- bamboo_twig_i18n/src/TwigExtension/I18n.php | 6 +++--- bamboo_twig_loader/src/TwigExtension/Loader.php | 2 +- bamboo_twig_loader/src/TwigExtension/Render.php | 6 +++--- bamboo_twig_security/src/TwigExtension/Security.php | 2 +- bamboo_twig_token/src/TwigExtension/Token.php | 2 +- .../bamboo_twig_test/src/Controller/TestsController.php | 4 ++-- tests/src/Functional/BambooTwigExtensionsI18nTest.php | 2 +- tests/src/Functional/BambooTwigLoaderTest.php | 2 +- tests/src/Functional/BambooTwigRenderTest.php | 2 +- tests/src/Functional/BambooTwigTestBase.php | 4 ++-- tests/src/Kernel/Loader/EntityBlockTest.php | 2 +- tests/src/Kernel/Render/ContentBlockTest.php | 2 +- tests/src/Kernel/Render/ImageTest.php | 6 +++--- 18 files changed, 28 insertions(+), 28 deletions(-) diff --git a/bamboo_twig_config/src/TwigExtension/Config.php b/bamboo_twig_config/src/TwigExtension/Config.php index 02eef0d..064fcad 100644 --- a/bamboo_twig_config/src/TwigExtension/Config.php +++ b/bamboo_twig_config/src/TwigExtension/Config.php @@ -2,8 +2,8 @@ namespace Drupal\bamboo_twig_config\TwigExtension; -use Twig\TwigFunction; use Drupal\bamboo_twig\TwigExtension\TwigExtensionBase; +use Twig\TwigFunction; /** * Provides getter for configs drupal storage as Twig Extensions. diff --git a/bamboo_twig_extensions/src/TwigExtension/TwigArray.php b/bamboo_twig_extensions/src/TwigExtension/TwigArray.php index b617be2..15a26b0 100644 --- a/bamboo_twig_extensions/src/TwigExtension/TwigArray.php +++ b/bamboo_twig_extensions/src/TwigExtension/TwigArray.php @@ -2,8 +2,8 @@ namespace Drupal\bamboo_twig_extensions\TwigExtension; -use Twig\TwigFilter; use Twig\Extension\AbstractExtension; +use Twig\TwigFilter; /** * Provides bridge for Array functions and filters. diff --git a/bamboo_twig_extensions/src/TwigExtension/TwigDate.php b/bamboo_twig_extensions/src/TwigExtension/TwigDate.php index 48a642e..e61edc7 100644 --- a/bamboo_twig_extensions/src/TwigExtension/TwigDate.php +++ b/bamboo_twig_extensions/src/TwigExtension/TwigDate.php @@ -2,10 +2,10 @@ namespace Drupal\bamboo_twig_extensions\TwigExtension; -use Twig\TwigFilter; -use Drupal\Core\Template\TwigEnvironment; use Drupal\Core\StringTranslation\StringTranslationTrait; +use Drupal\Core\Template\TwigEnvironment; use Twig\Extension\AbstractExtension; +use Twig\TwigFilter; /** * Provides bridge for Text functions and filters. diff --git a/bamboo_twig_extensions/src/TwigExtension/TwigText.php b/bamboo_twig_extensions/src/TwigExtension/TwigText.php index 29b2972..a4bcdc9 100644 --- a/bamboo_twig_extensions/src/TwigExtension/TwigText.php +++ b/bamboo_twig_extensions/src/TwigExtension/TwigText.php @@ -2,9 +2,9 @@ namespace Drupal\bamboo_twig_extensions\TwigExtension; -use Twig\TwigFilter; use Drupal\Core\Template\TwigEnvironment; use Twig\Extension\AbstractExtension; +use Twig\TwigFilter; /** * Provides bridge for Text functions and filters. diff --git a/bamboo_twig_file/src/TwigExtension/File.php b/bamboo_twig_file/src/TwigExtension/File.php index df89eb9..fff6123 100644 --- a/bamboo_twig_file/src/TwigExtension/File.php +++ b/bamboo_twig_file/src/TwigExtension/File.php @@ -2,9 +2,9 @@ namespace Drupal\bamboo_twig_file\TwigExtension; -use Twig\TwigFunction; -use Twig\TwigFilter; use Drupal\bamboo_twig\TwigExtension\TwigExtensionBase; +use Twig\TwigFilter; +use Twig\TwigFunction; /** * Provides a 'File' Twig Extensions. diff --git a/bamboo_twig_i18n/src/TwigExtension/I18n.php b/bamboo_twig_i18n/src/TwigExtension/I18n.php index 73bb35a..a13a07f 100644 --- a/bamboo_twig_i18n/src/TwigExtension/I18n.php +++ b/bamboo_twig_i18n/src/TwigExtension/I18n.php @@ -2,11 +2,11 @@ namespace Drupal\bamboo_twig_i18n\TwigExtension; -use Twig\TwigFilter; -use Twig\TwigFunction; use Drupal\bamboo_twig\TwigExtension\TwigExtensionBase; -use Drupal\Core\Template\TwigEnvironment; use Drupal\Core\Entity\EntityInterface; +use Drupal\Core\Template\TwigEnvironment; +use Twig\TwigFilter; +use Twig\TwigFunction; /** * Provides some 'Internationalization' Twig Extensions. diff --git a/bamboo_twig_loader/src/TwigExtension/Loader.php b/bamboo_twig_loader/src/TwigExtension/Loader.php index 7584cf8..4638569 100644 --- a/bamboo_twig_loader/src/TwigExtension/Loader.php +++ b/bamboo_twig_loader/src/TwigExtension/Loader.php @@ -2,9 +2,9 @@ namespace Drupal\bamboo_twig_loader\TwigExtension; -use Twig\TwigFunction; use Drupal\bamboo_twig\TwigExtension\TwigExtensionBase; use Drupal\Core\Entity\EntityInterface; +use Twig\TwigFunction; /** * Provides some loaders as Twig Extensions. diff --git a/bamboo_twig_loader/src/TwigExtension/Render.php b/bamboo_twig_loader/src/TwigExtension/Render.php index 4d4667b..0dcda18 100644 --- a/bamboo_twig_loader/src/TwigExtension/Render.php +++ b/bamboo_twig_loader/src/TwigExtension/Render.php @@ -2,12 +2,12 @@ namespace Drupal\bamboo_twig_loader\TwigExtension; -use Drupal\Core\Plugin\ContextAwarePluginInterface; -use Twig\TwigFunction; use Drupal\bamboo_twig\TwigExtension\TwigExtensionBase; use Drupal\Core\Block\TitleBlockPluginInterface; -use Drupal\Core\Routing\RouteObjectInterface; use Drupal\Core\Entity\EntityInterface; +use Drupal\Core\Plugin\ContextAwarePluginInterface; +use Drupal\Core\Routing\RouteObjectInterface; +use Twig\TwigFunction; /** * Provides some renderer as Twig Extensions. diff --git a/bamboo_twig_security/src/TwigExtension/Security.php b/bamboo_twig_security/src/TwigExtension/Security.php index 23837ba..32fa2e7 100644 --- a/bamboo_twig_security/src/TwigExtension/Security.php +++ b/bamboo_twig_security/src/TwigExtension/Security.php @@ -2,8 +2,8 @@ namespace Drupal\bamboo_twig_security\TwigExtension; -use Twig\TwigFunction; use Drupal\bamboo_twig\TwigExtension\TwigExtensionBase; +use Twig\TwigFunction; /** * Provides a 'Security' Twig Extensions. diff --git a/bamboo_twig_token/src/TwigExtension/Token.php b/bamboo_twig_token/src/TwigExtension/Token.php index 83db5a4..e18cc54 100644 --- a/bamboo_twig_token/src/TwigExtension/Token.php +++ b/bamboo_twig_token/src/TwigExtension/Token.php @@ -2,8 +2,8 @@ namespace Drupal\bamboo_twig_token\TwigExtension; -use Twig\TwigFunction; use Drupal\bamboo_twig\TwigExtension\TwigExtensionBase; +use Twig\TwigFunction; /** * Provides a token rempalcement as Twig Extensions. diff --git a/tests/modules/bamboo_twig_test/src/Controller/TestsController.php b/tests/modules/bamboo_twig_test/src/Controller/TestsController.php index f5e1424..bde8a3d 100644 --- a/tests/modules/bamboo_twig_test/src/Controller/TestsController.php +++ b/tests/modules/bamboo_twig_test/src/Controller/TestsController.php @@ -2,11 +2,11 @@ namespace Drupal\bamboo_twig_test\Controller; -use Drupal\Core\Controller\ControllerBase; use Drupal\Component\Datetime\DateTimePlus; +use Drupal\Core\Controller\ControllerBase; use Drupal\Core\Datetime\DrupalDateTime; -use Symfony\Component\DependencyInjection\ContainerInterface; use Drupal\Core\Extension\ModuleExtensionList; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * Returns renderer-responses for testing Twig functions/filters on templates. diff --git a/tests/src/Functional/BambooTwigExtensionsI18nTest.php b/tests/src/Functional/BambooTwigExtensionsI18nTest.php index 4478620..8526641 100644 --- a/tests/src/Functional/BambooTwigExtensionsI18nTest.php +++ b/tests/src/Functional/BambooTwigExtensionsI18nTest.php @@ -2,8 +2,8 @@ namespace Drupal\Tests\bamboo_twig\Functional; -use Drupal\language\Entity\ConfigurableLanguage; use Drupal\Component\Gettext\PoItem; +use Drupal\language\Entity\ConfigurableLanguage; /** * Tests Extensions i18n of twig filters and functions. diff --git a/tests/src/Functional/BambooTwigLoaderTest.php b/tests/src/Functional/BambooTwigLoaderTest.php index 7cb0855..59714aa 100644 --- a/tests/src/Functional/BambooTwigLoaderTest.php +++ b/tests/src/Functional/BambooTwigLoaderTest.php @@ -2,9 +2,9 @@ namespace Drupal\Tests\bamboo_twig\Functional; -use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait; use Drupal\Core\StreamWrapper\PublicStream; use Drupal\file\FileInterface; +use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait; /** * Tests Loaders twig filters and functions. diff --git a/tests/src/Functional/BambooTwigRenderTest.php b/tests/src/Functional/BambooTwigRenderTest.php index a5b0003..a88aebf 100644 --- a/tests/src/Functional/BambooTwigRenderTest.php +++ b/tests/src/Functional/BambooTwigRenderTest.php @@ -2,9 +2,9 @@ namespace Drupal\Tests\bamboo_twig\Functional; -use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait; use Drupal\Core\StreamWrapper\PublicStream; use Drupal\file\FileInterface; +use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait; /** * Tests Renders twig filters and functions. diff --git a/tests/src/Functional/BambooTwigTestBase.php b/tests/src/Functional/BambooTwigTestBase.php index d72c919..a82eab1 100644 --- a/tests/src/Functional/BambooTwigTestBase.php +++ b/tests/src/Functional/BambooTwigTestBase.php @@ -2,9 +2,9 @@ namespace Drupal\Tests\bamboo_twig\Functional; -use Drupal\Tests\BrowserTestBase; -use Drupal\language\Entity\ConfigurableLanguage; use Drupal\Core\Field\FieldStorageDefinitionInterface; +use Drupal\language\Entity\ConfigurableLanguage; +use Drupal\Tests\BrowserTestBase; use Drupal\Tests\field\Traits\EntityReferenceTestTrait; /** diff --git a/tests/src/Kernel/Loader/EntityBlockTest.php b/tests/src/Kernel/Loader/EntityBlockTest.php index 9168d2d..68be1e1 100644 --- a/tests/src/Kernel/Loader/EntityBlockTest.php +++ b/tests/src/Kernel/Loader/EntityBlockTest.php @@ -5,8 +5,8 @@ use Drupal\block\Entity\Block; use Drupal\block_content\Entity\BlockContent; use Drupal\KernelTests\KernelTestBase; -use Drupal\Tests\block\Traits\BlockCreationTrait; use Drupal\Tests\bamboo_twig\Traits\BlockCreationTrait as BambooBlockCreationTrait; +use Drupal\Tests\block\Traits\BlockCreationTrait; /** * @coversDefaultClass \Drupal\bamboo_twig_loader\TwigExtension\Loader diff --git a/tests/src/Kernel/Render/ContentBlockTest.php b/tests/src/Kernel/Render/ContentBlockTest.php index 44807f4..4ba2d9e 100644 --- a/tests/src/Kernel/Render/ContentBlockTest.php +++ b/tests/src/Kernel/Render/ContentBlockTest.php @@ -4,8 +4,8 @@ use Drupal\block_content\Entity\BlockContent; use Drupal\KernelTests\KernelTestBase; -use Drupal\Tests\block\Traits\BlockCreationTrait; use Drupal\Tests\bamboo_twig\Traits\BlockCreationTrait as BambooBlockCreationTrait; +use Drupal\Tests\block\Traits\BlockCreationTrait; /** * @coversDefaultClass \Drupal\bamboo_twig_loader\TwigExtension\Render diff --git a/tests/src/Kernel/Render/ImageTest.php b/tests/src/Kernel/Render/ImageTest.php index 0fd11fc..326f6fa 100644 --- a/tests/src/Kernel/Render/ImageTest.php +++ b/tests/src/Kernel/Render/ImageTest.php @@ -2,11 +2,11 @@ namespace Drupal\Tests\bamboo_twig\Kernel\Render; -use Drupal\KernelTests\KernelTestBase; -use Drupal\Tests\media\Traits\MediaTypeCreationTrait; +use Drupal\Core\Render\Markup; use Drupal\Core\StreamWrapper\PublicStream; use Drupal\file\FileInterface; -use Drupal\Core\Render\Markup; +use Drupal\KernelTests\KernelTestBase; +use Drupal\Tests\media\Traits\MediaTypeCreationTrait; /** * @coversDefaultClass \Drupal\bamboo_twig_loader\TwigExtension\Render