diff --git a/lingotek.drush.inc b/lingotek.drush.inc index a55f59ee..4f0389db 100644 --- a/lingotek.drush.inc +++ b/lingotek.drush.inc @@ -6,6 +6,7 @@ */ use Drupal\lingotek\Cli\Commands\Drush8\Drush8IoWrapper; +use Drush\Utils\StringUtils; /** * Implements hook_drush_command(). @@ -126,7 +127,7 @@ function drush_lingotek_request_translations($entity_type_id, $entity_id) { $cliService->setupOutput($facade); $cliService->setLogger($facade); - $langcodes = _convert_csv_to_array(drush_get_option('langcodes', 'all')); + $langcodes = StringUtils::csvToArray(drush_get_option('langcodes', 'all')); $table = $cliService->requestTranslations($entity_type_id, $entity_id, $langcodes); drush_print_table($table); @@ -139,7 +140,7 @@ function drush_lingotek_check_translations_statuses($entity_type_id, $entity_id) $cliService->setupOutput($facade); $cliService->setLogger($facade); - $langcodes = _convert_csv_to_array(drush_get_option('langcodes', 'all')); + $langcodes = StringUtils::csvToArray(drush_get_option('langcodes', 'all')); $statuses = $cliService->checkTranslationsStatuses($entity_type_id, $entity_id, $langcodes); $table = [ @@ -158,7 +159,7 @@ function drush_lingotek_download_translations($entity_type_id, $entity_id) { $cliService->setupOutput($facade); $cliService->setLogger($facade); - $langcodes = _convert_csv_to_array(drush_get_option('langcodes', 'all')); + $langcodes = StringUtils::csvToArray(drush_get_option('langcodes', 'all')); return $cliService->downloadTranslations($entity_type_id, $entity_id, $langcodes); } diff --git a/lingotek.info.yml b/lingotek.info.yml index 9fbe4ecd..06541347 100644 --- a/lingotek.info.yml +++ b/lingotek.info.yml @@ -5,6 +5,7 @@ package: Multilingual core: 8.x hidden: false configure: lingotek.settings +core_version_requirement: ^8 || ^9 dependencies: - drupal:locale - drupal:language diff --git a/src/Controller/LingotekManagementController.php b/src/Controller/LingotekManagementController.php index b9027957..793aba47 100644 --- a/src/Controller/LingotekManagementController.php +++ b/src/Controller/LingotekManagementController.php @@ -1,6 +1,7 @@ getConfig(); if (!$config instanceof ConfigEntityInterface) { $name = $config->getName(); @@ -207,7 +208,7 @@ class LingotekConfigSubscriber implements EventSubscriberInterface { * The configuration event. */ public function onConfigLanguageOverrideDelete(LanguageConfigOverrideCrudEvent $event) { - if (!drupal_installation_attempted()) { + if (!InstallerKernel::installationAttempted()) { /** @var \Drupal\lingotek\LanguageLocaleMapperInterface $languageMapper */ $languageMapper = \Drupal::service('lingotek.language_locale_mapper'); diff --git a/src/EventSubscriber/LingotekFieldDeletedConfigSubscriber.php b/src/EventSubscriber/LingotekFieldDeletedConfigSubscriber.php index fe2b4eec..f658d320 100644 --- a/src/EventSubscriber/LingotekFieldDeletedConfigSubscriber.php +++ b/src/EventSubscriber/LingotekFieldDeletedConfigSubscriber.php @@ -7,6 +7,7 @@ use Drupal\Core\Config\ConfigEvents; use Drupal\Core\Field\FieldConfigInterface; use Drupal\lingotek\LingotekConfigurationServiceInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; +use Drupal\Core\Installer\InstallerKernel; /** * Updates Lingotek config if a field is deleted. @@ -46,7 +47,7 @@ class LingotekFieldDeletedConfigSubscriber implements EventSubscriberInterface { * The configuration event. */ public function onConfigDelete(ConfigCrudEvent $event) { - if (!drupal_installation_attempted()) { + if (!InstallerKernel::installationAttempted()) { $config = $event->getConfig(); if ($config instanceof FieldConfigInterface) { $field_name = $config->getName(); diff --git a/src/Form/LingotekConfigManagementForm.php b/src/Form/LingotekConfigManagementForm.php index b6a1340d..1e18ea85 100644 --- a/src/Form/LingotekConfigManagementForm.php +++ b/src/Form/LingotekConfigManagementForm.php @@ -779,8 +779,8 @@ class LingotekConfigManagementForm extends FormBase { 'filename' => $filename, 'uri' => 'public://' . $filename, 'filemime' => 'text/plain', - 'created' => REQUEST_TIME, - 'changed' => REQUEST_TIME, + 'created' => \Drupal::time()->getRequestTime(), + 'changed' => \Drupal::time()->getRequestTime(), ]); file_put_contents($file->getFileUri(), $source_data); $file->save(); diff --git a/src/Form/LingotekManagementFormBase.php b/src/Form/LingotekManagementFormBase.php index 8dbf03ca..fd5830c3 100644 --- a/src/Form/LingotekManagementFormBase.php +++ b/src/Form/LingotekManagementFormBase.php @@ -30,6 +30,7 @@ use Drupal\lingotek\LingotekContentTranslationServiceInterface; use Drupal\lingotek\LingotekInterface; use Drupal\lingotek\LingotekLocale; use Drupal\lingotek\LingotekSetupTrait; +use Drupal\Core\Link; /** * Form for bulk management of content. @@ -515,8 +516,7 @@ abstract class LingotekManagementFormBase extends FormBase { } $row += [ - 'title' => $entity->hasLinkTemplate('canonical') ? $this->getLinkGenerator() - ->generate($entity->label(), Url::fromRoute($entity->toUrl() + 'title' => $entity->hasLinkTemplate('canonical') ? Link::fromTextAndUrl($entity->label(), Url::fromRoute($entity->toUrl() ->getRouteName(), [$entityTypeId => $entity->id()])) : $entity->id(), 'source' => $source, 'translations' => $translations, @@ -999,8 +999,8 @@ abstract class LingotekManagementFormBase extends FormBase { 'filename' => $filename, 'uri' => 'public://' . $filename, 'filemime' => 'text/plain', - 'created' => REQUEST_TIME, - 'changed' => REQUEST_TIME, + 'created' => \Drupal::time()->getRequestTime(), + 'changed' => \Drupal::time()->getRequestTime(), ]); file_put_contents($file->getFileUri(), $source_data); $file->save(); diff --git a/src/Form/LingotekSettingsTabAccountForm.php b/src/Form/LingotekSettingsTabAccountForm.php index 221fab81..c3083402 100644 --- a/src/Form/LingotekSettingsTabAccountForm.php +++ b/src/Form/LingotekSettingsTabAccountForm.php @@ -10,6 +10,7 @@ use Drupal\lingotek\Exception\LingotekApiException; use Drupal\lingotek\LingotekFilterManagerInterface; use Drupal\lingotek\LingotekInterface; use Symfony\Component\DependencyInjection\ContainerInterface; +use Drupal\Core\Link; /** * Configure Lingotek @@ -103,7 +104,7 @@ class LingotekSettingsTabAccountForm extends LingotekConfigFormBase { $communityRow = [ ['#markup' => $this->t('Community:'), '#prefix' => '', '#suffix' => ''], ['#markup' => new FormattableMarkup('@name (@id)', ['@name' => $default_community_name, '@id' => $default_community])], - ['#markup' => $this->getLinkGenerator()->generate($this->t('Edit defaults'), Url::fromRoute('lingotek.edit_defaults'))], + ['#markup' => Link::fromTextAndUrl($this->t('Edit defaults'), Url::fromRoute('lingotek.edit_defaults'))], ]; $default_workflow = $config->get('default.workflow'); @@ -111,7 +112,7 @@ class LingotekSettingsTabAccountForm extends LingotekConfigFormBase { $workflowRow = [ ['#markup' => $this->t('Default Workflow:'), '#prefix' => '', '#suffix' => ''], ['#markup' => new FormattableMarkup('@name (@id)', ['@name' => $default_workflow_name, '@id' => $default_workflow])], - ['#markup' => $this->getLinkGenerator()->generate($this->t('Edit defaults'), Url::fromRoute('lingotek.edit_defaults'))], + ['#markup' => Link::fromTextAndUrl($this->t('Edit defaults'), Url::fromRoute('lingotek.edit_defaults'))], ]; $default_project = $config->get('default.project'); @@ -119,7 +120,7 @@ class LingotekSettingsTabAccountForm extends LingotekConfigFormBase { $projectRow = [ ['#markup' => $this->t('Default Project:'), '#prefix' => '', '#suffix' => ''], ['#markup' => new FormattableMarkup('@name (@id)', ['@name' => $default_project_name, '@id' => $default_project])], - ['#markup' => $this->getLinkGenerator()->generate($this->t('Edit defaults'), Url::fromRoute('lingotek.edit_defaults'))], + ['#markup' => Link::fromTextAndUrl($this->t('Edit defaults'), Url::fromRoute('lingotek.edit_defaults'))], ]; $filters = $this->lingotekFilterManager->getLocallyAvailableFilters(); @@ -131,12 +132,12 @@ class LingotekSettingsTabAccountForm extends LingotekConfigFormBase { $filterRow = [ ['#markup' => $this->t('Default Filter:'), '#prefix' => '', '#suffix' => ''], ['#markup' => new FormattableMarkup('@name (@id)', ['@name' => $default_filter_label, '@id' => $default_filter])], - ['#markup' => $this->getLinkGenerator()->generate($this->t('Edit defaults'), Url::fromRoute('lingotek.edit_defaults'))], + ['#markup' => Link::fromTextAndUrl($this->t('Edit defaults'), Url::fromRoute('lingotek.edit_defaults'))], ]; $subfilterRow = [ ['#markup' => $this->t('Default Subfilter:'), '#prefix' => '', '#suffix' => ''], ['#markup' => new FormattableMarkup('@name (@id)', ['@name' => $default_subfilter_label, '@id' => $default_subfilter])], - ['#markup' => $this->getLinkGenerator()->generate($this->t('Edit defaults'), Url::fromRoute('lingotek.edit_defaults'))], + ['#markup' => Link::fromTextAndUrl($this->t('Edit defaults'), Url::fromRoute('lingotek.edit_defaults'))], ]; } @@ -146,7 +147,7 @@ class LingotekSettingsTabAccountForm extends LingotekConfigFormBase { $vaultRow = [ ['#markup' => $this->t('Default Vault:'), '#prefix' => '', '#suffix' => ''], ['#markup' => $default_vault ? new FormattableMarkup('@name (@id)', ['@name' => $default_vault_name, '@id' => $default_vault]) : ''], - ['#markup' => $this->getLinkGenerator()->generate($this->t('Edit defaults'), Url::fromRoute('lingotek.edit_defaults'))], + ['#markup' => Link::fromTextAndUrl($this->t('Edit defaults'), Url::fromRoute('lingotek.edit_defaults'))], ]; $tmsRow = [ diff --git a/src/Form/LingotekSettingsTabPreferencesForm.php b/src/Form/LingotekSettingsTabPreferencesForm.php index 6625a957..484b1041 100644 --- a/src/Form/LingotekSettingsTabPreferencesForm.php +++ b/src/Form/LingotekSettingsTabPreferencesForm.php @@ -4,6 +4,7 @@ namespace Drupal\lingotek\Form; use Drupal\Core\Url; use Drupal\Core\Form\FormStateInterface; +use Drupal\block\BlockRepositoryInterface; /** * Configure Lingotek @@ -192,7 +193,7 @@ class LingotekSettingsTabPreferencesForm extends LingotekConfigFormBase { protected function retrieveLanguageSwitcher() { if (\Drupal::moduleHandler()->moduleExists('block')) { $theme_default = $this->config('system.theme')->get('default'); - $this->lang_regions = system_region_list($theme_default, REGIONS_VISIBLE); + $this->lang_regions = system_region_list($theme_default, BlockRepositoryInterface::REGIONS_VISIBLE); $ids = \Drupal::entityQuery('block') ->condition('plugin', 'language_block:language_interface') ->condition('theme', $theme_default) diff --git a/src/LingotekContentTranslationService.php b/src/LingotekContentTranslationService.php index 3e3a6821..c41f951f 100644 --- a/src/LingotekContentTranslationService.php +++ b/src/LingotekContentTranslationService.php @@ -25,6 +25,7 @@ use Drupal\lingotek\Exception\LingotekDocumentArchivedException; use Drupal\lingotek\Exception\LingotekDocumentLockedException; use Drupal\lingotek\Exception\LingotekPaymentRequiredException; use Drupal\user\UserInterface; +use Drupal\node\NodeInterface; /** * Service for managing Lingotek content translations. @@ -152,7 +153,7 @@ class LingotekContentTranslationService implements LingotekContentTranslationSer $last_uploaded_time = $entity->getChangedTime(); // If document has not successfully imported after MAX_IMPORT_TIME // then move to ERROR state. - if (REQUEST_TIME - $last_uploaded_time > $maxImportTime) { + if (\Drupal::time()->getRequestTime() - $last_uploaded_time > $maxImportTime) { $this->setSourceStatus($entity, Lingotek::STATUS_ERROR); } else { @@ -1541,7 +1542,7 @@ class LingotekContentTranslationService implements LingotekContentTranslationSer if ($status_field_definition !== NULL && $status_field_definition->isTranslatable()) { $status_setting = $this->lingotekConfiguration->getPreference('target_download_status'); if ($status_setting !== "same-as-source") { - $status_value = ($status_setting === 'published') ? NODE_PUBLISHED : NODE_NOT_PUBLISHED; + $status_value = ($status_setting === 'published') ? NodeInterface::PUBLISHED : NodeInterface::NOT_PUBLISHED; $translation->set($status_field, $status_value); } } diff --git a/tests/modules/lingotek_test/src/LingotekFake.php b/tests/modules/lingotek_test/src/LingotekFake.php index 1449ffb5..c2f4338b 100644 --- a/tests/modules/lingotek_test/src/LingotekFake.php +++ b/tests/modules/lingotek_test/src/LingotekFake.php @@ -224,7 +224,7 @@ class LingotekFake implements LingotekInterface { // Save the timestamp of the upload. $timestamps = \Drupal::state()->get('lingotek.upload_timestamps', []); - $timestamps[$doc_id] = REQUEST_TIME; + $timestamps[$doc_id] = \Drupal::time()->getRequestTime(); \Drupal::state()->set('lingotek.upload_timestamps', $timestamps); return $doc_id; @@ -285,7 +285,7 @@ class LingotekFake implements LingotekInterface { // Save the timestamp of the upload. $timestamps = \Drupal::state()->get('lingotek.upload_timestamps', []); - $timestamps[$doc_id] = REQUEST_TIME; + $timestamps[$doc_id] = \Drupal::time()->getRequestTime(); \Drupal::state()->set('lingotek.upload_timestamps', $timestamps); // Our document is always imported correctly. diff --git a/tests/modules/lingotek_test/src/LingotekFakeBC.php b/tests/modules/lingotek_test/src/LingotekFakeBC.php index 689847f2..bc6c3012 100644 --- a/tests/modules/lingotek_test/src/LingotekFakeBC.php +++ b/tests/modules/lingotek_test/src/LingotekFakeBC.php @@ -23,7 +23,7 @@ class LingotekFakeBC extends LingotekFake implements LingotekInterface { // Save the timestamp of the upload. $timestamps = \Drupal::state()->get('lingotek.upload_timestamps', []); - $timestamps[$doc_id] = REQUEST_TIME; + $timestamps[$doc_id] = \Drupal::time()->getRequestTime(); \Drupal::state()->set('lingotek.upload_timestamps', $timestamps); // Our document is always imported correctly. diff --git a/tests/src/Functional/Actions/LingotekActionsTest.php b/tests/src/Functional/Actions/LingotekActionsTest.php index 64c4b63d..53ba4420 100644 --- a/tests/src/Functional/Actions/LingotekActionsTest.php +++ b/tests/src/Functional/Actions/LingotekActionsTest.php @@ -6,7 +6,7 @@ use Drupal\language\Entity\ConfigurableLanguage; use Drupal\language\Entity\ContentLanguageSettings; use Drupal\system\Entity\Action; use Drupal\Tests\lingotek\Functional\LingotekTestBase; -use Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait; +use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait; /** * Tests for Lingotek actions creation. diff --git a/tests/src/Functional/Form/LingotekSettingsTabParagraphsIntegrationFormTest.php b/tests/src/Functional/Form/LingotekSettingsTabParagraphsIntegrationFormTest.php index 2d64da26..3a953fe6 100644 --- a/tests/src/Functional/Form/LingotekSettingsTabParagraphsIntegrationFormTest.php +++ b/tests/src/Functional/Form/LingotekSettingsTabParagraphsIntegrationFormTest.php @@ -6,7 +6,7 @@ use Drupal\language\Entity\ConfigurableLanguage; use Drupal\language\Entity\ContentLanguageSettings; use Drupal\lingotek\Lingotek; use Drupal\Tests\lingotek\Functional\LingotekTestBase; -use Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait; +use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait; /** * Tests the Lingotek integrations settings form with paragraphs. diff --git a/tests/src/Functional/LingotekBulkDeleteTest.php b/tests/src/Functional/LingotekBulkDeleteTest.php index 9c0924b9..eb192e59 100644 --- a/tests/src/Functional/LingotekBulkDeleteTest.php +++ b/tests/src/Functional/LingotekBulkDeleteTest.php @@ -4,7 +4,7 @@ namespace Drupal\Tests\lingotek\Functional; use Drupal\language\Entity\ConfigurableLanguage; use Drupal\language\Entity\ContentLanguageSettings; -use Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait; +use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait; /** * Tests for bulk deletion in the bulk management page. diff --git a/tests/src/Functional/LingotekContentModerationSettingsTest.php b/tests/src/Functional/LingotekContentModerationSettingsTest.php index 2b34b87d..fe8b22b6 100644 --- a/tests/src/Functional/LingotekContentModerationSettingsTest.php +++ b/tests/src/Functional/LingotekContentModerationSettingsTest.php @@ -4,7 +4,7 @@ namespace Drupal\Tests\lingotek\Functional; use Drupal\language\Entity\ConfigurableLanguage; use Drupal\language\Entity\ContentLanguageSettings; -use Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait; +use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait; use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait; /** diff --git a/tests/src/Functional/LingotekJobManagementTests.php b/tests/src/Functional/LingotekJobManagementTests.php index 2f749b23..054d1fcf 100644 --- a/tests/src/Functional/LingotekJobManagementTests.php +++ b/tests/src/Functional/LingotekJobManagementTests.php @@ -11,7 +11,7 @@ use Drupal\lingotek\Entity\LingotekConfigMetadata; use Drupal\lingotek\Entity\LingotekContentMetadata; use Drupal\lingotek\Lingotek; use Drupal\Tests\field\Traits\EntityReferenceTestTrait; -use Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait; +use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait; /** * Tests job management listings. diff --git a/tests/src/Functional/LingotekNodeBulkTranslationTest.php b/tests/src/Functional/LingotekNodeBulkTranslationTest.php index 6e9f8bd2..55f925ab 100644 --- a/tests/src/Functional/LingotekNodeBulkTranslationTest.php +++ b/tests/src/Functional/LingotekNodeBulkTranslationTest.php @@ -1509,7 +1509,7 @@ class LingotekNodeBulkTranslationTest extends LingotekTestBase { // The document has not been imported yet, and it was uploaded long ago. \Drupal::state()->set('lingotek.document_status_completion', FALSE); - Node::load(1)->setChangedTime(REQUEST_TIME - 100000)->save(); + Node::load(1)->setChangedTime(\Drupal::time()->getRequestTime() - 100000)->save(); $key = $this->getBulkSelectionKey('en', 1); $edit = [ diff --git a/tests/src/Functional/LingotekNodeEmbeddingBricksTranslationTest.php b/tests/src/Functional/LingotekNodeEmbeddingBricksTranslationTest.php index 776d9ef7..37bb218b 100644 --- a/tests/src/Functional/LingotekNodeEmbeddingBricksTranslationTest.php +++ b/tests/src/Functional/LingotekNodeEmbeddingBricksTranslationTest.php @@ -6,7 +6,7 @@ use Drupal\Tests\field\Traits\EntityReferenceTestTrait; use Drupal\language\Entity\ConfigurableLanguage; use Drupal\language\Entity\ContentLanguageSettings; use Drupal\node\Entity\Node; -use Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait; +use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait; use Drupal\Tests\TestFileCreationTrait; /** diff --git a/tests/src/Functional/LingotekNodeEmbeddingTagsTranslationTest.php b/tests/src/Functional/LingotekNodeEmbeddingTagsTranslationTest.php index eac0cbba..43b1d557 100644 --- a/tests/src/Functional/LingotekNodeEmbeddingTagsTranslationTest.php +++ b/tests/src/Functional/LingotekNodeEmbeddingTagsTranslationTest.php @@ -10,7 +10,7 @@ use Drupal\language\Entity\ConfigurableLanguage; use Drupal\language\Entity\ContentLanguageSettings; use Drupal\node\Entity\Node; use Drupal\taxonomy\Entity\Term; -use Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait; +use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait; use Drupal\Tests\TestFileCreationTrait; /** diff --git a/tests/src/Functional/LingotekNodeManageTranslationTabTest.php b/tests/src/Functional/LingotekNodeManageTranslationTabTest.php index 31dc22ad..5735d8aa 100644 --- a/tests/src/Functional/LingotekNodeManageTranslationTabTest.php +++ b/tests/src/Functional/LingotekNodeManageTranslationTabTest.php @@ -9,7 +9,7 @@ use Drupal\Tests\field\Traits\EntityReferenceTestTrait; use Drupal\language\Entity\ConfigurableLanguage; use Drupal\language\Entity\ContentLanguageSettings; use Drupal\taxonomy\Entity\Term; -use Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait; +use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait; /** * Tests translating a node using the bulk management form. diff --git a/tests/src/Functional/LingotekNodeMultivaluedFieldTest.php b/tests/src/Functional/LingotekNodeMultivaluedFieldTest.php index 56226c8a..468c9b0f 100644 --- a/tests/src/Functional/LingotekNodeMultivaluedFieldTest.php +++ b/tests/src/Functional/LingotekNodeMultivaluedFieldTest.php @@ -9,6 +9,7 @@ use Drupal\field\Entity\FieldStorageConfig; use Drupal\language\Entity\ConfigurableLanguage; use Drupal\language\Entity\ContentLanguageSettings; use Drupal\node\Entity\Node; +use Drupal\Core\Entity\EntityDefinitionUpdateManagerInterface; /** * Tests translating a node including multivalued fields. @@ -77,7 +78,7 @@ class LingotekNodeMultivaluedFieldTest extends LingotekTestBase { drupal_static_reset(); \Drupal::entityTypeManager()->clearCachedDefinitions(); - \Drupal::entityDefinitionUpdateManager()->applyUpdates(); + EntityDefinitionUpdateManagerInterface::getChangeList(); // Rebuild the container so that the new languages are picked up by services // that hold a list of languages. $this->rebuildContainer(); diff --git a/tests/src/Functional/LingotekTaxonomyTermLongTitleTranslationTest.php b/tests/src/Functional/LingotekTaxonomyTermLongTitleTranslationTest.php index 71295c65..00e23cc8 100644 --- a/tests/src/Functional/LingotekTaxonomyTermLongTitleTranslationTest.php +++ b/tests/src/Functional/LingotekTaxonomyTermLongTitleTranslationTest.php @@ -6,7 +6,7 @@ use Drupal\language\Entity\ConfigurableLanguage; use Drupal\language\Entity\ContentLanguageSettings; use Drupal\taxonomy\Entity\Term; use Drupal\lingotek\Lingotek; -use Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait; +use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait; /** * Tests translating a taxonomy term with a very long title that doesn't fit. diff --git a/tests/src/Functional/LingotekTaxonomyTermTranslationTest.php b/tests/src/Functional/LingotekTaxonomyTermTranslationTest.php index eb3fe09f..c88403e2 100644 --- a/tests/src/Functional/LingotekTaxonomyTermTranslationTest.php +++ b/tests/src/Functional/LingotekTaxonomyTermTranslationTest.php @@ -5,7 +5,7 @@ namespace Drupal\Tests\lingotek\Functional; use Drupal\language\Entity\ConfigurableLanguage; use Drupal\language\Entity\ContentLanguageSettings; use Drupal\taxonomy\Entity\Term; -use Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait; +use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait; /** * Tests translating a taxonomy term. diff --git a/tests/src/Functional/LingotekUtilitiesDisassociateAllDocumentsTest.php b/tests/src/Functional/LingotekUtilitiesDisassociateAllDocumentsTest.php index e6754ed0..5aeb39a2 100644 --- a/tests/src/Functional/LingotekUtilitiesDisassociateAllDocumentsTest.php +++ b/tests/src/Functional/LingotekUtilitiesDisassociateAllDocumentsTest.php @@ -8,7 +8,7 @@ use Drupal\lingotek\Entity\LingotekContentMetadata; use Drupal\lingotek\Lingotek; use Drupal\node\Entity\Node; use Drupal\taxonomy\Entity\Term; -use Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait; +use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait; /** * Tests disassociating all site documents. diff --git a/tests/src/Functional/LingotekWorkbenchModerationSettingsTest.php b/tests/src/Functional/LingotekWorkbenchModerationSettingsTest.php index 9100234c..724303ac 100644 --- a/tests/src/Functional/LingotekWorkbenchModerationSettingsTest.php +++ b/tests/src/Functional/LingotekWorkbenchModerationSettingsTest.php @@ -4,7 +4,7 @@ namespace Drupal\Tests\lingotek\Functional; use Drupal\language\Entity\ConfigurableLanguage; use Drupal\language\Entity\ContentLanguageSettings; -use Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait; +use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait; use Drupal\workbench_moderation\Entity\ModerationState; /**