diff --git a/entity_reference_uuid.module b/entity_reference_uuid.module index b25cb3a..a1b2eef 100644 --- a/entity_reference_uuid.module +++ b/entity_reference_uuid.module @@ -5,43 +5,23 @@ * Hook implementations for the entity_reference_uuid module. */ -use Drupal\Core\StringTranslation\TranslatableMarkup; +use Drupal\Core\Hook\Attribute\LegacyHook; +use Drupal\entity_reference_uuid\Hook\EntityReferenceUuidHooks; /** * Implements hook_field_widget_info_alter(). */ +#[LegacyHook] function entity_reference_uuid_field_widget_info_alter(array &$info) { - if (isset($info['entity_reference_autocomplete'])) { - $info['entity_reference_autocomplete']['field_types'][] = 'entity_reference_uuid'; - } - if (isset($info['entity_reference_autocomplete_tags'])) { - $info['entity_reference_autocomplete_tags']['field_types'][] = 'entity_reference_uuid'; - } - if (isset($info['inline_entity_form_simple'])) { - $info['inline_entity_form_simple']['field_types'][] = 'entity_reference_uuid'; - } - if (isset($info['inline_entity_form_complex'])) { - $info['inline_entity_form_complex']['field_types'][] = 'entity_reference_uuid'; - } - if (isset($info['options_select'])) { - $info['options_select']['field_types'][] = 'entity_reference_uuid'; - } - if (isset($info['options_buttons'])) { - $info['options_buttons']['field_types'][] = 'entity_reference_uuid'; - } - if (isset($info['select2_entity_reference'])) { - $info['select2_entity_reference']['field_types'][] = 'entity_reference_uuid'; - } - if (isset($info['chosen_select'])) { - $info['chosen_select']['field_types'][] = 'entity_reference_uuid'; - } + \Drupal::service(EntityReferenceUuidHooks::class)->fieldWidgetInfoAlter($info); } /** * Implements hook_field_formatter_info_alter(). */ +#[LegacyHook] function entity_reference_uuid_field_formatter_info_alter(array &$info) { - $info['entity_reference_label']['field_types'][] = 'entity_reference_uuid'; + \Drupal::service(EntityReferenceUuidHooks::class)->fieldFormatterInfoAlter($info); } /** @@ -49,9 +29,7 @@ function entity_reference_uuid_field_formatter_info_alter(array &$info) { * * @todo Remove once minimum version supported is at least 10.2.0. */ +#[LegacyHook] function entity_reference_uuid_field_info_alter(array &$info): void { - // Allow module to work with versions of older versions of Drupal. - if (\version_compare(\Drupal::VERSION, '10.1.9999', '<')) { - $info['entity_reference_uuid']['category'] = new TranslatableMarkup("Reference"); - } + \Drupal::service(EntityReferenceUuidHooks::class)->fieldInfoAlter($info); } diff --git a/entity_reference_uuid.services.yml b/entity_reference_uuid.services.yml new file mode 100644 index 0000000..c88919d --- /dev/null +++ b/entity_reference_uuid.services.yml @@ -0,0 +1,9 @@ + +services: + Drupal\entity_reference_uuid\Hook\EntityReferenceUuidHooks: + class: Drupal\entity_reference_uuid\Hook\EntityReferenceUuidHooks + autowire: true + + Drupal\entity_reference_uuid\Hook\EntityReferenceUuidViewsHooks: + class: Drupal\entity_reference_uuid\Hook\EntityReferenceUuidViewsHooks + autowire: true diff --git a/entity_reference_uuid.views.inc b/entity_reference_uuid.views.inc index 71a3f44..004941a 100644 --- a/entity_reference_uuid.views.inc +++ b/entity_reference_uuid.views.inc @@ -5,6 +5,9 @@ * Provide views data for entity_reference_uuid. */ +use Drupal\Core\Hook\Attribute\LegacyHook; +use Drupal\entity_reference_uuid\Hook\EntityReferenceUuidViewsHooks; +use Drupal\Component\Utility\DeprecationHelper; use Drupal\Core\Field\BaseFieldDefinition; use Drupal\field\FieldStorageConfigInterface; @@ -13,14 +16,9 @@ use Drupal\field\FieldStorageConfigInterface; * * @see core_field_views_data() */ +#[LegacyHook] function entity_reference_uuid_field_views_data(FieldStorageConfigInterface $field_storage) { - $data = []; - - // The code below only deals with the Entity reference UUID field type. - if ($field_storage->getType() != 'entity_reference_uuid') { - return $data; - } - return entity_reference_uuid_field_views_data_helper($field_storage); + return \Drupal::service(EntityReferenceUuidViewsHooks::class)->fieldViewsData($field_storage); } /** @@ -36,7 +34,7 @@ function entity_reference_uuid_field_views_data(FieldStorageConfigInterface $fie * A data array as specified by hook_field_views_data(). */ function entity_reference_uuid_field_views_data_helper(FieldStorageConfigInterface $field_storage) { - $data = views_field_default_views_data($field_storage); + $data = DeprecationHelper::backwardsCompatibleCall(\Drupal::VERSION, '11.2.0', fn() => \Drupal::service('views.field_data_provider')->defaultFieldImplementation($field_storage), fn() => views_field_default_views_data($field_storage)); $entity_type_manager = \Drupal::entityTypeManager(); // The ID of the entity type the field is attached to. @@ -117,46 +115,10 @@ function entity_reference_uuid_field_views_data_helper(FieldStorageConfigInterfa /** * Implements hook_views_data_alter(). */ +#[LegacyHook] function entity_reference_uuid_views_data_alter(array &$data) { - // @see views_views_data() where it registers views data for the entity itself. - foreach (\Drupal::entityTypeManager()->getDefinitions() as $entity_type_id => $entity_type) { - // Only alter entity types exposed to Views. - if ($entity_type->hasHandlerClass('views_data') && $entity_type->hasKey('uuid')) { - - // Add direct and reverse relationships for base fields. - $base_field_definitions = \Drupal::service('entity_field.manager')->getBaseFieldDefinitions($entity_type_id); - foreach ($base_field_definitions as $base_field_name => $base_field_definition) { - if ($base_field_definition->getType() == 'entity_reference_uuid') { - /** @var \Drupal\Core\Field\BaseFieldDefinition $base_field_definition */ - entity_reference_uuid_views_data_helper($data, $entity_type, $base_field_definition); - } - } - - // Add an extra relationship if needed from the data table so that the - // UUID can be found and used. - // @todo Not clear if we actually need the relationship section here. - if ($entity_type->getDataTable()) { - $base_table = $entity_type->getBaseTable(); - $uuid_field = $entity_type->getKey('uuid'); - $base_field = $entity_type->getKey('id'); - $data[$entity_type->getDataTable()][$uuid_field] = [ - 'title' => t('Entity UUID Dummy'), - 'relationship' => [ - // Views name of the table being joined to from foo. - 'base' => $base_table, - // Database field name in example_table for the join. - 'base field' => $base_field, - // Real database field name. - 'field' => $uuid_field, - // ID of relationship handler plugin to use. - 'id' => 'entity_standard_uuid', - 'label' => t('UUID reference'), - ], - ]; - } - } - } + \Drupal::service(EntityReferenceUuidViewsHooks::class)->viewsDataAlter($data); } /** @@ -266,19 +228,9 @@ function entity_reference_uuid_views_data_helper(&$data, $entity_type, BaseField * * @see views_field_default_views_data() */ +#[LegacyHook] function entity_reference_uuid_field_views_data_alter(array &$data, FieldStorageConfigInterface $field_storage) { - // Views integration for entity reference uuid fields which reference taxonomy - // terms. - // Adds a term relationship to the default field data. - if ($field_storage->getType() == 'entity_reference_uuid' && $field_storage->getSetting('target_type') == 'taxonomy_term') { - foreach ($data as $table_name => $table_data) { - foreach ($table_data as $field_name => $field_data) { - if (isset($field_data['filter']) && $field_name != 'delta') { - $data[$table_name][$field_name]['filter']['id'] = 'entity_reference_uuid_taxonomy_index_uuid'; - } - } - } - } + \Drupal::service(EntityReferenceUuidViewsHooks::class)->fieldViewsDataAlter($data, $field_storage); } diff --git a/src/Hook/EntityReferenceUuidHooks.php b/src/Hook/EntityReferenceUuidHooks.php new file mode 100644 index 0000000..7e66792 --- /dev/null +++ b/src/Hook/EntityReferenceUuidHooks.php @@ -0,0 +1,65 @@ +getType() != 'entity_reference_uuid') { + return $data; + } + return entity_reference_uuid_field_views_data_helper($field_storage); + } + + /** + * Implements hook_views_data_alter(). + */ + #[Hook('views_data_alter')] + public function viewsDataAlter(array &$data) { + // @see views_views_data() where it registers views data for the entity itself. + foreach (\Drupal::entityTypeManager()->getDefinitions() as $entity_type_id => $entity_type) { + // Only alter entity types exposed to Views. + if ($entity_type->hasHandlerClass('views_data') && $entity_type->hasKey('uuid')) { + // Add direct and reverse relationships for base fields. + $base_field_definitions = \Drupal::service('entity_field.manager')->getBaseFieldDefinitions($entity_type_id); + foreach ($base_field_definitions as $base_field_name => $base_field_definition) { + if ($base_field_definition->getType() == 'entity_reference_uuid') { + /** @var \Drupal\Core\Field\BaseFieldDefinition $base_field_definition */ + entity_reference_uuid_views_data_helper($data, $entity_type, $base_field_definition); + } + } + // Add an extra relationship if needed from the data table so that the + // UUID can be found and used. + // @todo Not clear if we actually need the relationship section here. + if ($entity_type->getDataTable()) { + $base_table = $entity_type->getBaseTable(); + $uuid_field = $entity_type->getKey('uuid'); + $base_field = $entity_type->getKey('id'); + $data[$entity_type->getDataTable()][$uuid_field] = [ + 'title' => $this->t('Entity UUID Dummy'), + 'relationship' => [ + // Views name of the table being joined to from foo. + 'base' => $base_table, + // Database field name in example_table for the join. + 'base field' => $base_field, + // Real database field name. + 'field' => $uuid_field, + // ID of relationship handler plugin to use. + 'id' => 'entity_standard_uuid', + 'label' => $this->t('UUID reference'), + ], + ]; + } + } + } + } + + /** + * Implements hook_field_views_data_alter(). + * + * @see views_field_default_views_data() + */ + #[Hook('field_views_data_alter')] + public static function fieldViewsDataAlter(array &$data, FieldStorageConfigInterface $field_storage) { + // Views integration for entity reference uuid fields which reference taxonomy + // terms. + // Adds a term relationship to the default field data. + if ($field_storage->getType() == 'entity_reference_uuid' && $field_storage->getSetting('target_type') == 'taxonomy_term') { + foreach ($data as $table_name => $table_data) { + foreach ($table_data as $field_name => $field_data) { + if (isset($field_data['filter']) && $field_name != 'delta') { + $data[$table_name][$field_name]['filter']['id'] = 'entity_reference_uuid_taxonomy_index_uuid'; + } + } + } + } + } + +} diff --git a/src/Plugin/views/relationship/EntityStandardUuid.php b/src/Plugin/views/relationship/EntityStandardUuid.php index a86cf60..fa47b73 100644 --- a/src/Plugin/views/relationship/EntityStandardUuid.php +++ b/src/Plugin/views/relationship/EntityStandardUuid.php @@ -2,6 +2,7 @@ namespace Drupal\entity_reference_uuid\Plugin\views\relationship; +use Drupal\Component\Utility\DeprecationHelper; use Drupal\views\Plugin\views\relationship\Standard; use Drupal\views\Views; @@ -52,7 +53,7 @@ class EntityStandardUuid extends Standard { } // Join first from e.g. {node__field_foo}.field_foo_target_uuid to // {node}.uuid. - $l_join = Views::pluginManager('join')->createInstance($id, $def); + $l_join = DeprecationHelper::backwardsCompatibleCall(\Drupal::VERSION, '11.4.0', fn() => \Drupal::service('plugin.manager.views.join'), fn() => Views::pluginManager('join'))->createInstance($id, $def); // Use a short alias for this: $first_alias = $this->definition['entity base table'] . '_' . $this->table . '_' . $this->realField; @@ -76,7 +77,7 @@ class EntityStandardUuid extends Standard { } // Join next from e.g. {node}.nid to {node_field_data}.nid. This is needed // since uuid is not in the data table. - $join = Views::pluginManager('join')->createInstance($id, $def); + $join = DeprecationHelper::backwardsCompatibleCall(\Drupal::VERSION, '11.4.0', fn() => \Drupal::service('plugin.manager.views.join'), fn() => Views::pluginManager('join'))->createInstance($id, $def); // Use a short alias for this: $alias = $def['table'] . '_' . $this->table . '_' . $this->realField; diff --git a/tests/modules/entity_reference_uuid_test/entity_reference_uuid_test.module b/tests/modules/entity_reference_uuid_test/entity_reference_uuid_test.module index afb0f61..1daa303 100644 --- a/tests/modules/entity_reference_uuid_test/entity_reference_uuid_test.module +++ b/tests/modules/entity_reference_uuid_test/entity_reference_uuid_test.module @@ -5,28 +5,14 @@ * Module to provide test views and entity types. */ +use Drupal\Core\Hook\Attribute\LegacyHook; +use Drupal\entity_reference_uuid_test\Hook\EntityReferenceUuidTestHooks; use Drupal\node\NodeInterface; /** * Implements hook_ENTITY_TYPE_presave(). */ +#[LegacyHook] function entity_reference_uuid_test_node_presave(NodeInterface $entity) { - if ($entity->bundle() === 'test_nodetype_chemical') { - $constituents = (array) $entity->field_chemical_constituents->getValue(); - if (!isset($constituents[0]) || $constituents[0]['target_uuid'] !== $entity->uuid()) { - // This is a dirty hack to force a self-reference to exist as the first - // reference. - $value = [ - 'target_uuid' => $entity->uuid(), - ]; - array_unshift($constituents, $value); - $entity->field_chemical_constituents->setValue($constituents); - } - if ($entity->field_chemical_constituents->count() > 1) { - $entity->field_chemical_mixture_flag = TRUE; - } - else { - $entity->field_chemical_mixture_flag = FALSE; - } - } + \Drupal::service(EntityReferenceUuidTestHooks::class)->nodePresave($entity); } diff --git a/tests/modules/entity_reference_uuid_test/entity_reference_uuid_test.services.yml b/tests/modules/entity_reference_uuid_test/entity_reference_uuid_test.services.yml new file mode 100644 index 0000000..7872290 --- /dev/null +++ b/tests/modules/entity_reference_uuid_test/entity_reference_uuid_test.services.yml @@ -0,0 +1,5 @@ + +services: + Drupal\entity_reference_uuid_test\Hook\EntityReferenceUuidTestHooks: + class: Drupal\entity_reference_uuid_test\Hook\EntityReferenceUuidTestHooks + autowire: true diff --git a/tests/modules/entity_reference_uuid_test/src/Hook/EntityReferenceUuidTestHooks.php b/tests/modules/entity_reference_uuid_test/src/Hook/EntityReferenceUuidTestHooks.php new file mode 100644 index 0000000..ccb46af --- /dev/null +++ b/tests/modules/entity_reference_uuid_test/src/Hook/EntityReferenceUuidTestHooks.php @@ -0,0 +1,38 @@ +bundle() === 'test_nodetype_chemical') { + $constituents = (array) $entity->field_chemical_constituents->getValue(); + if (!isset($constituents[0]) || $constituents[0]['target_uuid'] !== $entity->uuid()) { + // This is a dirty hack to force a self-reference to exist as the first + // reference. + $value = [ + 'target_uuid' => $entity->uuid(), + ]; + array_unshift($constituents, $value); + $entity->field_chemical_constituents->setValue($constituents); + } + if ($entity->field_chemical_constituents->count() > 1) { + $entity->field_chemical_mixture_flag = TRUE; + } + else { + $entity->field_chemical_mixture_flag = FALSE; + } + } + } + +} diff --git a/tests/src/Kernel/EntityReferenceUuidItemTest.php b/tests/src/Kernel/EntityReferenceUuidItemTest.php index 0eff15d..775b7c1 100644 --- a/tests/src/Kernel/EntityReferenceUuidItemTest.php +++ b/tests/src/Kernel/EntityReferenceUuidItemTest.php @@ -2,6 +2,10 @@ namespace Drupal\Tests\entity_reference_uuid\Kernel; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; +use Drupal\Component\Utility\DeprecationHelper; +use Drupal\entity_test\EntityTestHelper; use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\KernelTests\Core\Entity\EntityKernelTestBase; @@ -14,6 +18,8 @@ use Drupal\Tests\SchemaCheckTestTrait; * * @see \Drupal\KernelTests\Core\Entity\EntityReferenceFieldTest */ +#[Group('entity_reference_uuid')] +#[RunTestsInSeparateProcesses] class EntityReferenceUuidItemTest extends EntityKernelTestBase { use EntityReferenceUuidTestTrait; @@ -139,7 +145,7 @@ class EntityReferenceUuidItemTest extends EntityKernelTestBase { ); // Test a non-referenceable bundle. - entity_test_create_bundle('non_referenceable', NULL, $this->referencedEntityType); + DeprecationHelper::backwardsCompatibleCall(\Drupal::VERSION, '11.2.0', fn() => EntityTestHelper::createBundle('non_referenceable', NULL, $this->referencedEntityType), fn() => entity_test_create_bundle('non_referenceable', NULL, $this->referencedEntityType)); $referenced_entity = $storage->create(['type' => 'non_referenceable']); $referenced_entity->save(); $field->target_uuid = $referenced_entity->uuid(); diff --git a/tests/src/Kernel/Views/EntityForwardDoubleRef.php b/tests/src/Kernel/Views/EntityForwardDoubleRef.php index 54db737..67b8d15 100644 --- a/tests/src/Kernel/Views/EntityForwardDoubleRef.php +++ b/tests/src/Kernel/Views/EntityForwardDoubleRef.php @@ -2,6 +2,8 @@ namespace Drupal\Tests\entity_reference_uuid\Kernel\Views; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; use Drupal\views\Views; /** @@ -9,6 +11,8 @@ use Drupal\views\Views; * * @group entity_reference_uuid */ +#[Group('entity_reference_uuid')] +#[RunTestsInSeparateProcesses] class EntityForwardDoubleRef extends UuidViewsKernelTestBase { /** diff --git a/tests/src/Kernel/Views/EntityForwardNodeRef.php b/tests/src/Kernel/Views/EntityForwardNodeRef.php index 4e6aa75..4ca018a 100644 --- a/tests/src/Kernel/Views/EntityForwardNodeRef.php +++ b/tests/src/Kernel/Views/EntityForwardNodeRef.php @@ -2,6 +2,8 @@ namespace Drupal\Tests\entity_reference_uuid\Kernel\Views; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; use Drupal\views\Views; /** @@ -9,6 +11,8 @@ use Drupal\views\Views; * * @group entity_reference_uuid */ +#[Group('entity_reference_uuid')] +#[RunTestsInSeparateProcesses] class EntityForwardNodeRef extends UuidViewsKernelTestBase { /** diff --git a/tests/src/Kernel/Views/EntityForwardRef.php b/tests/src/Kernel/Views/EntityForwardRef.php index 69ce68f..ecd5280 100644 --- a/tests/src/Kernel/Views/EntityForwardRef.php +++ b/tests/src/Kernel/Views/EntityForwardRef.php @@ -2,6 +2,8 @@ namespace Drupal\Tests\entity_reference_uuid\Kernel\Views; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; use Drupal\views\Views; /** @@ -9,6 +11,8 @@ use Drupal\views\Views; * * @group entity_reference_uuid */ +#[Group('entity_reference_uuid')] +#[RunTestsInSeparateProcesses] class EntityForwardRef extends UuidViewsKernelTestBase { /** diff --git a/tests/src/Kernel/Views/EntityReverseNodePlusForwardRef.php b/tests/src/Kernel/Views/EntityReverseNodePlusForwardRef.php index f85c9cd..b950247 100644 --- a/tests/src/Kernel/Views/EntityReverseNodePlusForwardRef.php +++ b/tests/src/Kernel/Views/EntityReverseNodePlusForwardRef.php @@ -2,6 +2,8 @@ namespace Drupal\Tests\entity_reference_uuid\Kernel\Views; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; use Drupal\views\Views; /** @@ -9,6 +11,8 @@ use Drupal\views\Views; * * @group entity_reference_uuid */ +#[Group('entity_reference_uuid')] +#[RunTestsInSeparateProcesses] class EntityReverseNodePlusForwardRef extends UuidViewsKernelTestBase { /** diff --git a/tests/src/Kernel/Views/EntityReverseNodeRef.php b/tests/src/Kernel/Views/EntityReverseNodeRef.php index e6eb429..3a1cb61 100644 --- a/tests/src/Kernel/Views/EntityReverseNodeRef.php +++ b/tests/src/Kernel/Views/EntityReverseNodeRef.php @@ -2,6 +2,8 @@ namespace Drupal\Tests\entity_reference_uuid\Kernel\Views; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; use Drupal\views\Views; /** @@ -9,6 +11,8 @@ use Drupal\views\Views; * * @group entity_reference_uuid */ +#[Group('entity_reference_uuid')] +#[RunTestsInSeparateProcesses] class EntityReverseNodeRef extends UuidViewsKernelTestBase { /** diff --git a/tests/src/Kernel/Views/NodeChemicalContainerConstituents.php b/tests/src/Kernel/Views/NodeChemicalContainerConstituents.php index 23c1fa6..0b2ed73 100644 --- a/tests/src/Kernel/Views/NodeChemicalContainerConstituents.php +++ b/tests/src/Kernel/Views/NodeChemicalContainerConstituents.php @@ -2,6 +2,8 @@ namespace Drupal\Tests\entity_reference_uuid\Kernel\Views; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; use Drupal\views\Views; /** @@ -9,6 +11,8 @@ use Drupal\views\Views; * * @group entity_reference_uuid */ +#[Group('entity_reference_uuid')] +#[RunTestsInSeparateProcesses] class NodeChemicalContainerConstituents extends UuidViewsKernelTestBase { /** diff --git a/tests/src/Kernel/Views/NodeForwardEntityRef.php b/tests/src/Kernel/Views/NodeForwardEntityRef.php index 2564041..d06f416 100644 --- a/tests/src/Kernel/Views/NodeForwardEntityRef.php +++ b/tests/src/Kernel/Views/NodeForwardEntityRef.php @@ -2,6 +2,8 @@ namespace Drupal\Tests\entity_reference_uuid\Kernel\Views; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; use Drupal\views\Views; /** @@ -9,6 +11,8 @@ use Drupal\views\Views; * * @group entity_reference_uuid */ +#[Group('entity_reference_uuid')] +#[RunTestsInSeparateProcesses] class NodeForwardEntityRef extends UuidViewsKernelTestBase { /** diff --git a/tests/src/Kernel/Views/NodeForwardRef.php b/tests/src/Kernel/Views/NodeForwardRef.php index 0cd8570..6e32564 100644 --- a/tests/src/Kernel/Views/NodeForwardRef.php +++ b/tests/src/Kernel/Views/NodeForwardRef.php @@ -2,6 +2,8 @@ namespace Drupal\Tests\entity_reference_uuid\Kernel\Views; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; use Drupal\views\Views; /** @@ -9,6 +11,8 @@ use Drupal\views\Views; * * @group entity_reference_uuid */ +#[Group('entity_reference_uuid')] +#[RunTestsInSeparateProcesses] class NodeForwardRef extends UuidViewsKernelTestBase { /** diff --git a/tests/src/Kernel/Views/NodeReverseEntityRef.php b/tests/src/Kernel/Views/NodeReverseEntityRef.php index c35524b..f2bd93d 100644 --- a/tests/src/Kernel/Views/NodeReverseEntityRef.php +++ b/tests/src/Kernel/Views/NodeReverseEntityRef.php @@ -2,6 +2,8 @@ namespace Drupal\Tests\entity_reference_uuid\Kernel\Views; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; use Drupal\views\Views; /** @@ -9,6 +11,8 @@ use Drupal\views\Views; * * @group entity_reference_uuid */ +#[Group('entity_reference_uuid')] +#[RunTestsInSeparateProcesses] class NodeReverseEntityRef extends UuidViewsKernelTestBase { /** diff --git a/tests/src/Kernel/Views/NodeReverseRef.php b/tests/src/Kernel/Views/NodeReverseRef.php index dc14dd5..b60f65a 100644 --- a/tests/src/Kernel/Views/NodeReverseRef.php +++ b/tests/src/Kernel/Views/NodeReverseRef.php @@ -2,6 +2,8 @@ namespace Drupal\Tests\entity_reference_uuid\Kernel\Views; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; use Drupal\views\Views; /** @@ -9,6 +11,8 @@ use Drupal\views\Views; * * @group entity_reference_uuid */ +#[Group('entity_reference_uuid')] +#[RunTestsInSeparateProcesses] class NodeReverseRef extends UuidViewsKernelTestBase { /** diff --git a/tests/src/Kernel/Views/UuidViewsKernelTestBase.php b/tests/src/Kernel/Views/UuidViewsKernelTestBase.php index ab25d60..92a2915 100644 --- a/tests/src/Kernel/Views/UuidViewsKernelTestBase.php +++ b/tests/src/Kernel/Views/UuidViewsKernelTestBase.php @@ -74,8 +74,6 @@ abstract class UuidViewsKernelTestBase extends KernelTestBase { */ protected function setUp(): void { parent::setUp(); - - $this->installSchema('system', ['sequences']); $this->installSchema('node', ['node_access']); $this->installEntitySchema('user');