Created
January 12, 2026 07:46
-
-
Save fago/bc70cac0c4165fcddf09d772d1cc614d to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| commit 36028b6d361f01f01079ae049f307aece6e81f0d | |
| Author: Lucas Hedding <24691-lucashedding@users.noreply.drupalcode.org> | |
| Date: Fri Jan 9 13:41:16 2026 +0000 | |
| chore: #3565687 Fix failing HEAD | |
| By: heddn | |
| diff --git b/layout_builder_st.install a/layout_builder_st.install | |
| index cc5fb7e..bb99fcc 100644 | |
| --- b/layout_builder_st.install | |
| +++ a/layout_builder_st.install | |
| @@ -5,7 +5,6 @@ | |
| * Contains installation and update hooks for layout_builder_st. | |
| */ | |
| -use Drupal\Core\Hook\Attribute\LegacyRequirementsHook; | |
| use Drupal\field\Entity\FieldConfig; | |
| use Drupal\field\Entity\FieldStorageConfig; | |
| use Drupal\layout_builder_st\Plugin\SectionStorage\OverridesSectionStorage; | |
| @@ -67,7 +66,6 @@ function _layout_builder_st_add_translation_field($entity_type_id, $bundle) { | |
| /** | |
| * Implements hook_requirements(). | |
| */ | |
| -#[LegacyRequirementsHook] | |
| function layout_builder_st_requirements($phase) { | |
| $requirements = []; | |
| if ($phase === 'install' && \Drupal::moduleHandler()->moduleExists('layout_builder_at')) { | |
| diff --git b/layout_builder_st.module a/layout_builder_st.module | |
| index 20d0021..7de63c5 100644 | |
| --- b/layout_builder_st.module | |
| +++ a/layout_builder_st.module | |
| @@ -6,12 +6,10 @@ | |
| */ | |
| use Drupal\Core\Entity\FieldableEntityInterface; | |
| -use Drupal\Core\Hook\Attribute\LegacyHook; | |
| -use Drupal\Core\Hook\Attribute\LegacyModuleImplementsAlter; | |
| -use Drupal\layout_builder\Form\OverridesEntityForm as CoreOverridesEntityForm; | |
| use Drupal\layout_builder_st\Element\LayoutBuilder; | |
| use Drupal\layout_builder_st\Entity\LayoutBuilderEntityViewDisplay; | |
| use Drupal\layout_builder_st\Form\BlockContentInlineBlockTranslateForm; | |
| +use Drupal\layout_builder\Form\OverridesEntityForm as CoreOverridesEntityForm; | |
| use Drupal\layout_builder_st\Form\OverridesEntityForm; | |
| use Drupal\layout_builder_st\Plugin\Block\InlineBlock; | |
| use Drupal\layout_builder_st\Plugin\Field\FieldWidget\LayoutBuilderWidget; | |
| @@ -20,7 +18,6 @@ use Drupal\layout_builder_st\Plugin\SectionStorage\OverridesSectionStorage; | |
| /** | |
| * Implements hook_module_implements_alter(). | |
| */ | |
| -#[LegacyModuleImplementsAlter] | |
| function layout_builder_st_module_implements_alter(array &$implementations, string $hook): void { | |
| if ($hook === 'entity_type_alter') { | |
| // Move our hook_entity_type_alter() implementation to the end of the list. | |
| @@ -36,7 +33,6 @@ function layout_builder_st_module_implements_alter(array &$implementations, stri | |
| * | |
| * @see https://www.drupal.org/project/drupal/issues/2946333#comment-13129737 | |
| */ | |
| -#[LegacyHook] | |
| function layout_builder_st_entity_type_alter(array &$entity_types): void { | |
| // Replace entity_view_display class with our own. | |
| /** @var \Drupal\Core\Entity\EntityTypeInterface[] $entity_types */ | |
| @@ -68,7 +64,6 @@ function layout_builder_st_entity_type_alter(array &$entity_types): void { | |
| /** | |
| * Implements hook_block_alter(). | |
| */ | |
| -#[LegacyHook] | |
| function layout_builder_st_block_alter(array &$definitions): void { | |
| foreach ($definitions as &$definition) { | |
| if ($definition['id'] === 'inline_block') { | |
| @@ -81,7 +76,6 @@ function layout_builder_st_block_alter(array &$definitions): void { | |
| /** | |
| * Implements hook_layout_builder_section_storage_alter(). | |
| */ | |
| -#[LegacyHook] | |
| function layout_builder_st_layout_builder_section_storage_alter(array &$definitions): void { | |
| $definition = $definitions['overrides']; | |
| $definition->setClass(OverridesSectionStorage::class); | |
| @@ -90,7 +84,6 @@ function layout_builder_st_layout_builder_section_storage_alter(array &$definiti | |
| /** | |
| * Implements hook_field_widget_info_alter(). | |
| */ | |
| -#[LegacyHook] | |
| function layout_builder_st_field_widget_info_alter(array &$info): void { | |
| if (isset($info['layout_builder_widget'])) { | |
| $info['layout_builder_widget']['field_types'][] = 'layout_translation'; | |
| @@ -102,7 +95,6 @@ function layout_builder_st_field_widget_info_alter(array &$info): void { | |
| /** | |
| * Implements hook_modules_installed(). | |
| */ | |
| -#[LegacyHook] | |
| function layout_builder_st_modules_installed(array $modules): void { | |
| if (in_array('layout_builder_at', $modules, TRUE)) { | |
| \Drupal::messenger()->addError('Layout Builder Symmetric Translations is not compatible with Layout Builder Asymmetric Translations. One of these should be uninstalled'); | |
| @@ -112,7 +104,6 @@ function layout_builder_st_modules_installed(array $modules): void { | |
| /** | |
| * Implements hook_element_plugin_alter(). | |
| */ | |
| -#[LegacyHook] | |
| function layout_builder_st_element_plugin_alter(array &$definitions): void { | |
| if (isset($definitions['layout_builder'])) { | |
| $definitions['layout_builder']['class'] = LayoutBuilder::class; | |
| diff --git b/src/EventSubscriber/ComponentPluginTranslate.php a/src/EventSubscriber/ComponentPluginTranslate.php | |
| index c8b7a9d..a661410 100644 | |
| --- b/src/EventSubscriber/ComponentPluginTranslate.php | |
| +++ a/src/EventSubscriber/ComponentPluginTranslate.php | |
| @@ -53,7 +53,7 @@ final class ComponentPluginTranslate implements EventSubscriberInterface { | |
| /** | |
| * {@inheritdoc} | |
| */ | |
| - public static function getSubscribedEvents(): array { | |
| + public static function getSubscribedEvents() { | |
| $events[LayoutBuilderEvents::SECTION_COMPONENT_BUILD_RENDER_ARRAY] = ['onBuildRender', 200]; | |
| return $events; | |
| } | |
| diff --git b/src/Form/OverridesEntityForm.php a/src/Form/OverridesEntityForm.php | |
| index f6325fa..485e446 100644 | |
| --- b/src/Form/OverridesEntityForm.php | |
| +++ a/src/Form/OverridesEntityForm.php | |
| @@ -4,8 +4,8 @@ namespace Drupal\layout_builder_st\Form; | |
| use Drupal\Core\Form\FormStateInterface; | |
| use Drupal\layout_builder\Form\OverridesEntityForm as CoreOverridesEntityForm; | |
| -use Drupal\layout_builder\SectionStorageInterface; | |
| use Drupal\layout_builder_st\Plugin\SectionStorage\OverridesSectionStorage; | |
| +use Drupal\layout_builder\SectionStorageInterface; | |
| use Drupal\layout_builder_st\TranslationsHelperTrait; | |
| /** | |
| diff --git b/src/Hook/AlterHooks.php a/src/Hook/AlterHooks.php | |
| deleted file mode 100644 | |
| index 4484739..0000000 | |
| --- b/src/Hook/AlterHooks.php | |
| +++ /dev/null | |
| @@ -1,119 +0,0 @@ | |
| -<?php | |
| - | |
| -namespace Drupal\layout_builder_st\Hook; | |
| - | |
| -use Drupal\Core\Entity\FieldableEntityInterface; | |
| -use Drupal\Core\Hook\Attribute\Hook; | |
| -use Drupal\Core\Hook\Order\OrderAfter; | |
| -use Drupal\Core\Messenger\MessengerInterface; | |
| -use Drupal\Core\StringTranslation\StringTranslationTrait; | |
| -use Drupal\layout_builder\Form\OverridesEntityForm as CoreOverridesEntityForm; | |
| -use Drupal\layout_builder_st\Element\LayoutBuilder; | |
| -use Drupal\layout_builder_st\Entity\LayoutBuilderEntityViewDisplay; | |
| -use Drupal\layout_builder_st\Form\BlockContentInlineBlockTranslateForm; | |
| -use Drupal\layout_builder_st\Form\OverridesEntityForm; | |
| -use Drupal\layout_builder_st\Plugin\Block\InlineBlock; | |
| -use Drupal\layout_builder_st\Plugin\Field\FieldWidget\LayoutBuilderWidget; | |
| -use Drupal\layout_builder_st\Plugin\SectionStorage\OverridesSectionStorage; | |
| - | |
| -/** | |
| - * Helper class to handle altering core layout builder functionality. | |
| - */ | |
| -class AlterHooks { | |
| - | |
| - public function __construct( | |
| - protected MessengerInterface $messenger, | |
| - ) {} | |
| - | |
| - use StringTranslationTrait; | |
| - | |
| - /** | |
| - * Alter layout builder entity type to use this module's implementation. | |
| - * | |
| - * @see https://www.drupal.org/project/drupal/issues/2946333#comment-13129737 | |
| - */ | |
| - #[Hook(hook: 'entity_type_alter', order: new OrderAfter(['layout_builder']))] | |
| - public function entityTypeAlter(array &$entity_types): void { | |
| - // Replace entity_view_display class with our own. | |
| - /** @var \Drupal\Core\Entity\EntityTypeInterface[] $entity_types */ | |
| - $entity_types['entity_view_display'] | |
| - ->setClass(LayoutBuilderEntityViewDisplay::class); | |
| - | |
| - /** @var \Drupal\Core\Entity\EntityTypeInterface $entity_type */ | |
| - foreach ($entity_types as $entity_type) { | |
| - if ($entity_type->entityClassImplements(FieldableEntityInterface::class)) { | |
| - $form_class = $entity_type->getFormClass('layout_builder'); | |
| - if ($form_class !== CoreOverridesEntityForm::class) { | |
| - $this->messenger->addError( | |
| - $this->t('The "layout_builder" form class for @entity_type entity type is already overridden by @class. This is incompatible with the layout_builder_st module'), | |
| - [ | |
| - '@entity_type' => $entity_type->getLabel(), | |
| - '@class' => $form_class, | |
| - ] | |
| - ); | |
| - } | |
| - $entity_type->setFormClass('layout_builder', OverridesEntityForm::class); | |
| - } | |
| - } | |
| - | |
| - if (isset($entity_types['block_content'])) { | |
| - $entity_types['block_content']->setFormClass('layout_builder_translate', BlockContentInlineBlockTranslateForm::class); | |
| - } | |
| - } | |
| - | |
| - /** | |
| - * Implements hook_block_alter(). | |
| - */ | |
| - #[Hook(hook: 'block_alter')] | |
| - public function blockAlter(array &$definitions): void { | |
| - foreach ($definitions as &$definition) { | |
| - if ($definition['id'] === 'inline_block') { | |
| - // Replace with our extended InlineBlock class to handle translations. | |
| - $definition['class'] = InlineBlock::class; | |
| - } | |
| - } | |
| - } | |
| - | |
| - /** | |
| - * Implements hook_layout_builder_section_storage_alter(). | |
| - */ | |
| - #[Hook(hook: 'layout_builder_section_storage_alter')] | |
| - public function sectionStorageAlter(array &$definitions): void { | |
| - $definition = $definitions['overrides']; | |
| - $definition->setClass(OverridesSectionStorage::class); | |
| - } | |
| - | |
| - /** | |
| - * Implements hook_field_widget_info_alter(). | |
| - */ | |
| - #[Hook(hook: 'field_widget_info_alter')] | |
| - public function fieldWidgetInfoAlter(array &$info): void { | |
| - if (isset($info['layout_builder_widget'])) { | |
| - $info['layout_builder_widget']['field_types'][] = 'layout_translation'; | |
| - $info['layout_builder_widget']['class'] = LayoutBuilderWidget::class; | |
| - $info['layout_builder_widget']['provider'] = 'layout_builder_st'; | |
| - } | |
| - } | |
| - | |
| - /** | |
| - * Implements hook_modules_installed(). | |
| - */ | |
| - #[Hook(hook: 'modules_installed')] | |
| - public function modulesInstalled(array $modules): void { | |
| - if (in_array('layout_builder_at', $modules, TRUE)) { | |
| - $this->messenger->addError('Layout Builder Symmetric Translations is not compatible with Layout Builder Asymmetric Translations. One of these should be uninstalled'); | |
| - } | |
| - } | |
| - | |
| - /** | |
| - * Implements hook_element_plugin_alter(). | |
| - */ | |
| - #[Hook(hook: 'element_plugin_alter')] | |
| - public function elementPluginAlter(array &$definitions): void { | |
| - if (isset($definitions['layout_builder'])) { | |
| - $definitions['layout_builder']['class'] = LayoutBuilder::class; | |
| - $definitions['layout_builder']['provider'] = 'layout_builder_st'; | |
| - } | |
| - } | |
| - | |
| -} | |
| diff --git b/src/Hook/RequirementHooks.php a/src/Hook/RequirementHooks.php | |
| deleted file mode 100644 | |
| index 2b15288..0000000 | |
| --- b/src/Hook/RequirementHooks.php | |
| +++ /dev/null | |
| @@ -1,38 +0,0 @@ | |
| -<?php | |
| - | |
| -namespace Drupal\layout_builder_st\Hook; | |
| - | |
| -use Drupal\Core\Extension\ModuleHandlerInterface; | |
| -use Drupal\Core\Extension\Requirement\RequirementSeverity; | |
| -use Drupal\Core\Hook\Attribute\Hook; | |
| -use Drupal\Core\StringTranslation\StringTranslationTrait; | |
| - | |
| -/** | |
| - * Requirement hooks. | |
| - */ | |
| -class RequirementHooks { | |
| - | |
| - public function __construct( | |
| - protected ModuleHandlerInterface $moduleHandler, | |
| - ) {} | |
| - | |
| - use StringTranslationTrait; | |
| - | |
| - /** | |
| - * Implements hook_requirements(). | |
| - */ | |
| - #[Hook('runtime_requirements')] | |
| - public function runtimeRequirements($phase) { | |
| - $requirements = []; | |
| - | |
| - if ($this->moduleHandler->moduleExists('layout_builder_at')) { | |
| - $requirements['layout_builder_at_incompatibility'] = [ | |
| - 'severity' => RequirementSeverity::Error, | |
| - 'description' => $this->t('Layout Builder Symmetric Translations is not compatible with Layout Builder Asymmetric Translations. One of these should be uninstalled'), | |
| - ]; | |
| - } | |
| - | |
| - return $requirements; | |
| - } | |
| - | |
| -} | |
| diff --git b/src/Install/Requirements/LayoutBuilderSynchronous.php a/src/Install/Requirements/LayoutBuilderSynchronous.php | |
| deleted file mode 100644 | |
| index 3c9a66b..0000000 | |
| --- b/src/Install/Requirements/LayoutBuilderSynchronous.php | |
| +++ /dev/null | |
| @@ -1,32 +0,0 @@ | |
| -<?php | |
| - | |
| -declare(strict_types=1); | |
| - | |
| -namespace Drupal\layout_builder_st\Install\Requirements; | |
| - | |
| -use Drupal\Core\Extension\InstallRequirementsInterface; | |
| -use Drupal\Core\Extension\Requirement\RequirementSeverity; | |
| -use Drupal\Core\StringTranslation\TranslatableMarkup; | |
| - | |
| -/** | |
| - * Install time requirements. | |
| - */ | |
| -class LayoutBuilderSynchronous implements InstallRequirementsInterface { | |
| - | |
| - /** | |
| - * {@inheritdoc} | |
| - */ | |
| - public static function getRequirements(): array { | |
| - $requirements = []; | |
| - | |
| - if (\Drupal::moduleHandler()->moduleExists('layout_builder_at')) { | |
| - $requirements['layout_builder_at_incompatibility'] = [ | |
| - 'severity' => RequirementSeverity::Error, | |
| - 'description' => new TranslatableMarkup('Layout Builder Symmetric Translations can not be installed when Layout Builder Asymmetric Translations is also installed.'), | |
| - ]; | |
| - } | |
| - | |
| - return $requirements; | |
| - } | |
| - | |
| -} | |
| diff --git b/tests/src/Functional/Jsonapi/LayoutBuilderEntityViewDisplayTest.php a/tests/src/Functional/Jsonapi/LayoutBuilderEntityViewDisplayTest.php | |
| index 77791ab..21022d7 100644 | |
| --- b/tests/src/Functional/Jsonapi/LayoutBuilderEntityViewDisplayTest.php | |
| +++ a/tests/src/Functional/Jsonapi/LayoutBuilderEntityViewDisplayTest.php | |
| @@ -8,15 +8,13 @@ use Drupal\layout_builder_st\Entity\LayoutBuilderEntityViewDisplay; | |
| use Drupal\layout_builder_st\Plugin\SectionStorage\OverridesSectionStorage; | |
| use Drupal\layout_builder_st\ResourceTypeRepository; | |
| use Drupal\Tests\layout_builder\Functional\Jsonapi\LayoutBuilderEntityViewDisplayTest as CoreTest; | |
| -use PHPUnit\Framework\Attributes\Group; | |
| -use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; | |
| /** | |
| * JSON:API integration test for the "EntityViewDisplay" config entity type. | |
| + * | |
| + * @group jsonapi | |
| + * @group layout_builder | |
| */ | |
| -#[Group('jsonapi')] | |
| -#[Group('layout_builder_st')] | |
| -#[RunTestsInSeparateProcesses] | |
| class LayoutBuilderEntityViewDisplayTest extends CoreTest { | |
| /** | |
| diff --git b/tests/src/Functional/LayoutBuilderTranslationTest.php a/tests/src/Functional/LayoutBuilderTranslationTest.php | |
| index decbf85..bdc4408 100644 | |
| --- b/tests/src/Functional/LayoutBuilderTranslationTest.php | |
| +++ a/tests/src/Functional/LayoutBuilderTranslationTest.php | |
| @@ -4,22 +4,18 @@ declare(strict_types=1); | |
| namespace Drupal\Tests\layout_builder_st\Functional; | |
| -use Drupal\Core\Entity\Entity\EntityViewDisplay; | |
| -use Drupal\Core\Url; | |
| use Drupal\field\Entity\FieldConfig; | |
| use Drupal\field\Entity\FieldStorageConfig; | |
| use Drupal\layout_builder\Plugin\SectionStorage\OverridesSectionStorage; | |
| use Drupal\Tests\content_translation\Functional\ContentTranslationTestBase; | |
| -use PHPUnit\Framework\Attributes\Group; | |
| -use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; | |
| +use Drupal\Core\Entity\Entity\EntityViewDisplay; | |
| +use Drupal\Core\Url; | |
| /** | |
| * Tests that the Layout Builder UI works with translated content. | |
| * | |
| - * @group layout_builder_st | |
| + * @group layout_builder | |
| */ | |
| -#[Group('layout_builder_st')] | |
| -#[RunTestsInSeparateProcesses] | |
| class LayoutBuilderTranslationTest extends ContentTranslationTestBase { | |
| use TranslationTestTrait; | |
| diff --git b/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayJsonAnonTest.php a/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayJsonAnonTest.php | |
| index 30df4d5..8fef3b3 100644 | |
| --- b/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayJsonAnonTest.php | |
| +++ a/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayJsonAnonTest.php | |
| @@ -5,18 +5,13 @@ declare(strict_types=1); | |
| namespace Drupal\Tests\layout_builder_st\Functional\Rest; | |
| use Drupal\Tests\rest\Functional\AnonResourceTestTrait; | |
| -use PHPUnit\Framework\Attributes\Group; | |
| -use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; | |
| /** | |
| * Test JSON anonymous resource. | |
| * | |
| - * @group layout_builder_st | |
| + * @group layout_builder | |
| * @group rest | |
| */ | |
| -#[Group('layout_builder_st')] | |
| -#[Group('rest')] | |
| -#[RunTestsInSeparateProcesses] | |
| class LayoutBuilderEntityViewDisplayJsonAnonTest extends LayoutBuilderEntityViewDisplayResourceTestBase { | |
| use AnonResourceTestTrait; | |
| diff --git b/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayJsonBasicAuthTest.php a/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayJsonBasicAuthTest.php | |
| index 8d7b162..20d3b4e 100644 | |
| --- b/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayJsonBasicAuthTest.php | |
| +++ a/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayJsonBasicAuthTest.php | |
| @@ -5,18 +5,13 @@ declare(strict_types=1); | |
| namespace Drupal\Tests\layout_builder_st\Functional\Rest; | |
| use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait; | |
| -use PHPUnit\Framework\Attributes\Group; | |
| -use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; | |
| /** | |
| * Test JSON basic auth resource. | |
| * | |
| - * @group layout_builder_st | |
| + * @group layout_builder | |
| * @group rest | |
| */ | |
| -#[Group('layout_builder_st')] | |
| -#[Group('rest')] | |
| -#[RunTestsInSeparateProcesses] | |
| class LayoutBuilderEntityViewDisplayJsonBasicAuthTest extends LayoutBuilderEntityViewDisplayResourceTestBase { | |
| use BasicAuthResourceTestTrait; | |
| diff --git b/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayJsonCookieTest.php a/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayJsonCookieTest.php | |
| index 2a5cee3..7721692 100644 | |
| --- b/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayJsonCookieTest.php | |
| +++ a/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayJsonCookieTest.php | |
| @@ -5,18 +5,13 @@ declare(strict_types=1); | |
| namespace Drupal\Tests\layout_builder_st\Functional\Rest; | |
| use Drupal\Tests\rest\Functional\CookieResourceTestTrait; | |
| -use PHPUnit\Framework\Attributes\Group; | |
| -use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; | |
| /** | |
| * Test JSON cookie resource. | |
| * | |
| - * @group layout_builder_st | |
| + * @group layout_builder | |
| * @group rest | |
| */ | |
| -#[Group('layout_builder_st')] | |
| -#[Group('rest')] | |
| -#[RunTestsInSeparateProcesses] | |
| class LayoutBuilderEntityViewDisplayJsonCookieTest extends LayoutBuilderEntityViewDisplayResourceTestBase { | |
| use CookieResourceTestTrait; | |
| diff --git b/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayResourceTestBase.php a/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayResourceTestBase.php | |
| index c7977c7..b052930 100644 | |
| --- b/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayResourceTestBase.php | |
| +++ a/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayResourceTestBase.php | |
| @@ -6,24 +6,16 @@ namespace Drupal\Tests\layout_builder_st\Functional\Rest; | |
| use Drupal\FunctionalTests\Rest\EntityViewDisplayResourceTestBase; | |
| use Drupal\layout_builder_st\Plugin\SectionStorage\OverridesSectionStorage; | |
| -use PHPUnit\Framework\Attributes\Group; | |
| -use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; | |
| /** | |
| * Provides a base class for testing LayoutBuilderEntityViewDisplay resources. | |
| */ | |
| -#[Group('layout_builder_st')] | |
| -#[Group('rest')] | |
| -#[RunTestsInSeparateProcesses] | |
| abstract class LayoutBuilderEntityViewDisplayResourceTestBase extends EntityViewDisplayResourceTestBase { | |
| /** | |
| * {@inheritdoc} | |
| */ | |
| - protected static $modules = [ | |
| - 'layout_builder', | |
| - 'layout_builder_st', | |
| - ]; | |
| + protected static $modules = ['layout_builder_st']; | |
| /** | |
| * {@inheritdoc} | |
| @@ -45,15 +37,8 @@ abstract class LayoutBuilderEntityViewDisplayResourceTestBase extends EntityView | |
| protected function getExpectedNormalizedEntity() { | |
| $expected = parent::getExpectedNormalizedEntity(); | |
| array_unshift($expected['dependencies']['module'], 'layout_builder'); | |
| - // @todo remove this logic after Drupal 10 support is sunset. | |
| - if (version_compare(\Drupal::VERSION, '10.9', '>')) { | |
| - unset($expected['content']['links']); | |
| - } | |
| $expected['hidden'][OverridesSectionStorage::FIELD_NAME] = TRUE; | |
| $expected['hidden'][OverridesSectionStorage::TRANSLATED_CONFIGURATION_FIELD_NAME] = TRUE; | |
| - if (version_compare(\Drupal::VERSION, '10.9', '>')) { | |
| - $expected['hidden']['links'] = TRUE; | |
| - } | |
| $expected['third_party_settings']['layout_builder'] = [ | |
| 'enabled' => TRUE, | |
| 'allow_custom' => TRUE, | |
| diff --git b/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayXmlAnonTest.php a/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayXmlAnonTest.php | |
| index 83b33d5..2e87e5b 100644 | |
| --- b/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayXmlAnonTest.php | |
| +++ a/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayXmlAnonTest.php | |
| @@ -6,18 +6,13 @@ namespace Drupal\Tests\layout_builder_st\Functional\Rest; | |
| use Drupal\Tests\rest\Functional\AnonResourceTestTrait; | |
| use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait; | |
| -use PHPUnit\Framework\Attributes\Group; | |
| -use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; | |
| /** | |
| * Test XML anonymous resource. | |
| * | |
| - * @group layout_builder_st | |
| + * @group layout_builder | |
| * @group rest | |
| */ | |
| -#[Group('layout_builder_st')] | |
| -#[Group('rest')] | |
| -#[RunTestsInSeparateProcesses] | |
| class LayoutBuilderEntityViewDisplayXmlAnonTest extends LayoutBuilderEntityViewDisplayResourceTestBase { | |
| use AnonResourceTestTrait; | |
| diff --git b/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayXmlBasicAuthTest.php a/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayXmlBasicAuthTest.php | |
| index cf929af..191b9c8 100644 | |
| --- b/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayXmlBasicAuthTest.php | |
| +++ a/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayXmlBasicAuthTest.php | |
| @@ -6,18 +6,13 @@ namespace Drupal\Tests\layout_builder_st\Functional\Rest; | |
| use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait; | |
| use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait; | |
| -use PHPUnit\Framework\Attributes\Group; | |
| -use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; | |
| /** | |
| * Test XML basic auth resource. | |
| * | |
| - * @group layout_builder_st | |
| + * @group layout_builder | |
| * @group rest | |
| */ | |
| -#[Group('layout_builder_st')] | |
| -#[Group('rest')] | |
| -#[RunTestsInSeparateProcesses] | |
| class LayoutBuilderEntityViewDisplayXmlBasicAuthTest extends LayoutBuilderEntityViewDisplayResourceTestBase { | |
| use BasicAuthResourceTestTrait; | |
| diff --git b/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayXmlCookieTest.php a/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayXmlCookieTest.php | |
| index d41bd55..771c6f2 100644 | |
| --- b/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayXmlCookieTest.php | |
| +++ a/tests/src/Functional/Rest/LayoutBuilderEntityViewDisplayXmlCookieTest.php | |
| @@ -6,18 +6,13 @@ namespace Drupal\Tests\layout_builder_st\Functional\Rest; | |
| use Drupal\Tests\rest\Functional\CookieResourceTestTrait; | |
| use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait; | |
| -use PHPUnit\Framework\Attributes\Group; | |
| -use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; | |
| /** | |
| * Test XML cookie resource. | |
| * | |
| - * @group layout_builder_st | |
| + * @group layout_builder | |
| * @group rest | |
| */ | |
| -#[Group('layout_builder_st')] | |
| -#[Group('rest')] | |
| -#[RunTestsInSeparateProcesses] | |
| class LayoutBuilderEntityViewDisplayXmlCookieTest extends LayoutBuilderEntityViewDisplayResourceTestBase { | |
| use CookieResourceTestTrait; | |
| diff --git b/tests/src/Functional/Rest/OverrideSectionsTest.php a/tests/src/Functional/Rest/OverrideSectionsTest.php | |
| index 0e5cd93..defc161 100644 | |
| --- b/tests/src/Functional/Rest/OverrideSectionsTest.php | |
| +++ a/tests/src/Functional/Rest/OverrideSectionsTest.php | |
| @@ -9,18 +9,13 @@ use Drupal\Core\Url; | |
| use Drupal\layout_builder\Plugin\SectionStorage\OverridesSectionStorage; | |
| use Drupal\node\Entity\Node; | |
| use GuzzleHttp\RequestOptions; | |
| -use PHPUnit\Framework\Attributes\Group; | |
| -use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; | |
| /** | |
| * Tests that override layout sections are not exposed via the REST API. | |
| * | |
| - * @group layout_builder_st | |
| + * @group layout_builder | |
| * @group rest | |
| */ | |
| -#[Group('layout_builder_st')] | |
| -#[Group('rest')] | |
| -#[RunTestsInSeparateProcesses] | |
| class OverrideSectionsTest extends LayoutRestTestBase { | |
| /** | |
| diff --git b/tests/src/FunctionalJavascript/InlineBlockTranslationTest.php a/tests/src/FunctionalJavascript/InlineBlockTranslationTest.php | |
| index e0af9d0..65e368f 100644 | |
| --- b/tests/src/FunctionalJavascript/InlineBlockTranslationTest.php | |
| +++ a/tests/src/FunctionalJavascript/InlineBlockTranslationTest.php | |
| @@ -4,20 +4,16 @@ declare(strict_types=1); | |
| namespace Drupal\Tests\layout_builder_st\FunctionalJavascript; | |
| -use Drupal\Core\Url; | |
| use Drupal\language\Entity\ConfigurableLanguage; | |
| +use Drupal\Core\Url; | |
| use Drupal\Tests\layout_builder\FunctionalJavascript\InlineBlockTestBase; | |
| use Drupal\Tests\layout_builder_st\Functional\TranslationTestTrait; | |
| -use PHPUnit\Framework\Attributes\Group; | |
| -use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; | |
| /** | |
| * Tests that inline blocks works with content translation. | |
| * | |
| - * @group layout_builder_st | |
| + * @group layout_builder | |
| */ | |
| -#[Group('layout_builder_st')] | |
| -#[RunTestsInSeparateProcesses] | |
| class InlineBlockTranslationTest extends InlineBlockTestBase { | |
| use LayoutBuilderTestTrait; | |
| diff --git b/tests/src/FunctionalJavascript/ModeratedTranslationTest.php a/tests/src/FunctionalJavascript/ModeratedTranslationTest.php | |
| index e23bc27..ca870b9 100644 | |
| --- b/tests/src/FunctionalJavascript/ModeratedTranslationTest.php | |
| +++ a/tests/src/FunctionalJavascript/ModeratedTranslationTest.php | |
| @@ -11,16 +11,12 @@ use Drupal\node\Entity\Node; | |
| use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait; | |
| use Drupal\Tests\contextual\FunctionalJavascript\ContextualLinkClickTrait; | |
| use Drupal\Tests\layout_builder_st\Functional\TranslationTestTrait; | |
| -use PHPUnit\Framework\Attributes\Group; | |
| -use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; | |
| /** | |
| * Test moderated and translated layout overrides. | |
| * | |
| - * @group layout_builder_st | |
| + * @group layout_builder | |
| */ | |
| -#[Group('layout_builder_st')] | |
| -#[RunTestsInSeparateProcesses] | |
| class ModeratedTranslationTest extends WebDriverTestBase { | |
| use LayoutBuilderTestTrait; | |
| diff --git b/tests/src/FunctionalJavascript/TranslationTest.php a/tests/src/FunctionalJavascript/TranslationTest.php | |
| index b9db53b..73006f2 100644 | |
| --- b/tests/src/FunctionalJavascript/TranslationTest.php | |
| +++ a/tests/src/FunctionalJavascript/TranslationTest.php | |
| @@ -4,21 +4,17 @@ declare(strict_types=1); | |
| namespace Drupal\Tests\layout_builder_st\FunctionalJavascript; | |
| -use Drupal\Core\Url; | |
| use Drupal\FunctionalJavascriptTests\WebDriverTestBase; | |
| use Drupal\language\Entity\ConfigurableLanguage; | |
| +use Drupal\Core\Url; | |
| use Drupal\Tests\contextual\FunctionalJavascript\ContextualLinkClickTrait; | |
| use Drupal\Tests\layout_builder_st\Functional\TranslationTestTrait; | |
| -use PHPUnit\Framework\Attributes\Group; | |
| -use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; | |
| /** | |
| * Tests that block settings can be translated. | |
| * | |
| - * @group layout_builder_st | |
| + * @group layout_builder | |
| */ | |
| -#[Group('layout_builder_st')] | |
| -#[RunTestsInSeparateProcesses] | |
| class TranslationTest extends WebDriverTestBase { | |
| use LayoutBuilderTestTrait; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment