From 531ad7f7eae3a62768e7feb01f4d600c6e08bc20 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 14 Nov 2023 10:59:28 -0500 Subject: [PATCH] VACMS-15954 Add phpcs baselines (#16109) * Add PHP Codesniffer Baselines - This prevents phpcs from failing due to existing errors - Bulk fix use ordering with phpcbf - Add php-codesniffer-baseline as dev requirement and regenerate baseline file --- composer.json | 4 +- composer.lock | 53 ++++++++++++++++++- .../va_gov_api/src/Resources/BannerAlerts.php | 6 +-- .../EventSubscriber/EntityEventSubscriber.php | 6 +-- .../TableAuditViewsEventSubscriber.php | 2 +- .../EventSubscriber/ThemeEventSubscriber.php | 4 +- .../src/Form/ExclusionTypesAdminForm.php | 2 +- .../FieldGroupFormatter/Tooltip.php | 2 +- .../Plugin/views/access/PdfAuditAccess.php | 2 +- .../Constraint/RequireScopeValidator.php | 2 +- .../src/Commands/SiteStatusCommands.php | 2 +- .../ContentReleaseNotificationController.php | 4 +- .../ContentReleaseIntervalSubscriber.php | 2 +- .../src/Form/PreviewForm.php | 4 +- .../AdvancedQueue/JobType/ReleaseDispatch.php | 2 +- .../TimeSinceLastContentRelease.php | 2 +- .../TimeSinceLastContentReleaseError.php | 2 +- .../src/Service/ModerationActions.php | 2 +- .../CloneEntityFinderDiscovery.php | 2 +- .../custom/va_gov_clone/src/CloneManager.php | 2 +- .../Strategy/Resolver/Resolver.php | 2 +- .../src/Form/Resolver/Resolver.php | 2 +- .../src/GitHub/GitHubRepositoryDispatch.php | 2 +- .../LocalFilesystemBuildFile.php | 2 +- .../EntityEventStrategy/ExceptionTest.php | 2 +- .../src/Request/Request.php | 2 +- .../src/Form/SmartDateOverrideForm.php | 2 +- .../src/Controller/VaGovFlagsController.php | 2 +- .../src/BranchSearch/BranchSearch.php | 2 +- .../src/Commands/RepositoryCommands.php | 2 +- .../src/Commands/ApiClientCommands.php | 2 +- .../EventSubscriber/LovellEventSubscriber.php | 12 ++--- .../Variables/BreadcrumbEventVariables.php | 3 +- .../src/Access/RouteAccessChecks.php | 4 +- .../src/Service/MenuReductionService.php | 2 +- .../src/EventSubscriber/MessageLogger.php | 4 +- .../src/EventSubscriber/PostRowSave.php | 8 +-- .../src/EventSubscriber/PrepareRow.php | 4 +- .../src/Paragraph/CollapsiblePanel.php | 2 +- .../src/Paragraph/CollapsiblePanelItem.php | 2 +- .../src/Paragraph/LinksListItem.php | 4 +- .../src/Paragraph/NumberCallout.php | 2 +- .../va_gov_migrate/src/Paragraph/Process.php | 2 +- .../src/Paragraph/QAAccordion.php | 2 +- .../va_gov_migrate/src/Paragraph/QASchema.php | 2 +- .../src/Paragraph/ReactWidget.php | 2 +- .../va_gov_migrate/src/ParagraphMigrator.php | 2 +- .../va_gov_migrate/src/ParagraphType.php | 2 +- .../migrate/process/VAFieldOfficeHours.php | 2 +- .../migrate/source/AlertBlockSource.php | 6 +-- .../migrate/source/MetalsmithSource.php | 6 +-- .../va_gov_multilingual.module | 2 +- .../JobType/OutdatedContentNotification.php | 2 +- .../src/Plugin/Notifier/Slack.php | 2 +- .../src/Service/NotificationsManager.php | 2 +- .../src/Form/VaGovFacilityForceQueueForm.php | 2 +- .../src/StaticServiceProvider.php | 2 +- .../EventSubscriber/EntityEventSubscriber.php | 4 +- .../va_gov_resources_and_support.deploy.php | 2 +- .../src/EventSubscriber/UserImport.php | 4 +- .../src/EntityAutocompleteMatcher.php | 2 +- .../VAMCEntityEventSubscriber.php | 8 +-- .../VAMCEntityPreventReuse.php | 6 +-- .../custom/va_gov_vamc/va_gov_vamc.install | 4 +- .../QueueWorker/RequiredServiceBase.php | 2 +- .../va_gov_vet_center.module | 2 +- .../va_gov_workflow/va_gov_workflow.module | 2 +- .../Service/SectionHierarchyBreadcrumb.php | 2 +- docroot/phpcs.baseline.xml | 53 +++++++++++++++++++ .../themes/custom/vagovclaro/vagovclaro.theme | 2 +- .../PreventAbsoluteCmsLinksValidatorTest.php | 2 +- .../PreventLocalFileLinksValidatorTest.php | 2 +- .../FrontendBuild/BuildMetricsTest.php | 2 +- .../FrontendBuild/ReleaseStateManagerTest.php | 2 +- .../Migration/VaFacilityNcaMigrationTest.php | 2 +- .../phpunit/Migration/VaFormMigrationTest.php | 2 +- ...VaHealthCareLocalFacilityMigrationTest.php | 2 +- tests/phpunit/Ops/DatadogTest.php | 4 +- .../Support/Classes/VaGovBrowserTestBase.php | 2 +- .../Support/Classes/VaGovUnitTestBase.php | 2 +- .../Support/Traits/ValidatorTestTrait.php | 2 +- .../FormRouteSubscriberTest.php | 2 +- .../Strategy/Resolver/ResolverTest.php | 2 +- .../EntityEventSubscriberTest.php | 6 +-- .../unit/Form/Resolver/ResolverTest.php | 4 +- .../GitHub/GitHubRepositoryDispatchTest.php | 2 +- .../LocalFilesystemBuildFileTest.php | 6 +-- .../EntityEventStrategy/OnDemandTest.php | 4 +- .../EntityEventStrategy/VerboseFalseTest.php | 6 +-- .../Strategy/GitHubRepositoryDispatchTest.php | 2 +- .../Strategy/LocalFilesystemBuildFileTest.php | 2 +- .../unit/Reporter/ReporterTest.php | 2 +- .../unit/Request/RequestTest.php | 4 +- .../unit/Strategy/Resolver/ResolverTest.php | 2 +- .../unit/Discovery/DiscoveryTest.php | 2 +- .../unit/Api/Client/ApiClientTest.php | 8 +-- .../unit/Api/Client/RawApiClientTest.php | 4 +- .../unit/Api/Settings/ApiSettingsTest.php | 2 +- 98 files changed, 248 insertions(+), 143 deletions(-) create mode 100644 docroot/phpcs.baseline.xml diff --git a/composer.json b/composer.json index d8caa44026..e69d5e0978 100644 --- a/composer.json +++ b/composer.json @@ -8,6 +8,7 @@ "require-dev": { "behat/mink": "^1.10", "behat/mink-browserkit-driver": "^2.1", + "digitalrevolution/php-codesniffer-baseline": "^1.1", "drupal/devel": "^5.0", "drupal/html_tag_usage": "^1.0@beta", "drupal/media_entity_generic": "^1.0" @@ -289,7 +290,8 @@ "dealerdirect/phpcodesniffer-composer-installer": true, "php-http/discovery": true, "cweagans/composer-patches": true, - "orakili/composer-drupal-info-file-patch-helper": true + "orakili/composer-drupal-info-file-patch-helper": true, + "digitalrevolution/php-codesniffer-baseline": true } }, "extra": { diff --git a/composer.lock b/composer.lock index 3827aa7bc8..1784d55bd2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "08f620d95b73058a67aed476a9070dae", + "content-hash": "782d00549944f970d02bb65812fd711b", "packages": [ { "name": "alchemy/zippy", @@ -27578,6 +27578,57 @@ }, "time": "2022-03-28T14:33:51+00:00" }, + { + "name": "digitalrevolution/php-codesniffer-baseline", + "version": "v1.1.2", + "source": { + "type": "git", + "url": "https://github.com/123inkt/php-codesniffer-baseline.git", + "reference": "00d7cd414cc0fc12e88ee3321d92fe3d2313a9e7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/123inkt/php-codesniffer-baseline/zipball/00d7cd414cc0fc12e88ee3321d92fe3d2313a9e7", + "reference": "00d7cd414cc0fc12e88ee3321d92fe3d2313a9e7", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0 || ^2.0", + "php": ">=7.4", + "squizlabs/php_codesniffer": "^3.6" + }, + "require-dev": { + "composer/composer": "^2.0", + "micheh/phpcs-gitlab": "^1.1", + "mikey179/vfsstream": "1.6.10", + "phpmd/phpmd": "@stable", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.4", + "phpstan/phpstan-phpunit": "^1.0", + "phpstan/phpstan-strict-rules": "^1.1", + "phpunit/phpunit": "^9.5", + "roave/security-advisories": "dev-latest" + }, + "type": "composer-plugin", + "extra": { + "class": "DR\\CodeSnifferBaseline\\Plugin\\Plugin" + }, + "autoload": { + "psr-4": { + "DR\\CodeSnifferBaseline\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Digital Revolution PHP_Codesniffer baseline extension", + "support": { + "issues": "https://github.com/123inkt/php-codesniffer-baseline/issues", + "source": "https://github.com/123inkt/php-codesniffer-baseline/tree/v1.1.2" + }, + "time": "2022-05-31T08:26:56+00:00" + }, { "name": "drupal/html_tag_usage", "version": "1.0.0-beta4", diff --git a/docroot/modules/custom/va_gov_api/src/Resources/BannerAlerts.php b/docroot/modules/custom/va_gov_api/src/Resources/BannerAlerts.php index 69dbe68f9d..7440f9eb05 100644 --- a/docroot/modules/custom/va_gov_api/src/Resources/BannerAlerts.php +++ b/docroot/modules/custom/va_gov_api/src/Resources/BannerAlerts.php @@ -2,9 +2,6 @@ namespace Drupal\va_gov_api\Resources; -use Drupal\jsonapi\ResourceResponse; -use Drupal\jsonapi_resources\Resource\EntityResourceBase; -use Symfony\Component\HttpFoundation\Request; use Drupal\Core\Cache\CacheableMetadata; use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityInterface; @@ -13,8 +10,11 @@ use Drupal\Core\Path\PathValidatorInterface; use Drupal\jsonapi\JsonApiResource\ResourceObject; use Drupal\jsonapi\JsonApiResource\ResourceObjectData; +use Drupal\jsonapi\ResourceResponse; use Drupal\jsonapi\ResourceType\ResourceType; +use Drupal\jsonapi_resources\Resource\EntityResourceBase; use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Component\HttpFoundation\Request; /** * The BannerAlerts JSON:API resource. diff --git a/docroot/modules/custom/va_gov_backend/src/EventSubscriber/EntityEventSubscriber.php b/docroot/modules/custom/va_gov_backend/src/EventSubscriber/EntityEventSubscriber.php index fce02f96da..55f268fcfd 100644 --- a/docroot/modules/custom/va_gov_backend/src/EventSubscriber/EntityEventSubscriber.php +++ b/docroot/modules/custom/va_gov_backend/src/EventSubscriber/EntityEventSubscriber.php @@ -2,13 +2,13 @@ namespace Drupal\va_gov_backend\EventSubscriber; +use Drupal\Core\Config\Entity\ConfigEntityType; +use Drupal\Core\Entity\EntityTypeManager; +use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\core_event_dispatcher\EntityHookEvents; use Drupal\core_event_dispatcher\Event\Entity\EntityPresaveEvent; use Drupal\core_event_dispatcher\Event\Entity\EntityTypeBuildEvent; use Drupal\core_event_dispatcher\Event\Form\FormIdAlterEvent; -use Drupal\Core\Config\Entity\ConfigEntityType; -use Drupal\Core\Entity\EntityTypeManager; -use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\field_event_dispatcher\Event\Field\WidgetSingleElementFormAlterEvent; use Drupal\field_event_dispatcher\FieldHookEvents; use Drupal\node\NodeInterface; diff --git a/docroot/modules/custom/va_gov_backend/src/EventSubscriber/TableAuditViewsEventSubscriber.php b/docroot/modules/custom/va_gov_backend/src/EventSubscriber/TableAuditViewsEventSubscriber.php index d9e5f48c6a..5a88c980f3 100644 --- a/docroot/modules/custom/va_gov_backend/src/EventSubscriber/TableAuditViewsEventSubscriber.php +++ b/docroot/modules/custom/va_gov_backend/src/EventSubscriber/TableAuditViewsEventSubscriber.php @@ -2,8 +2,8 @@ namespace Drupal\va_gov_backend\EventSubscriber; -use Drupal\Core\Render\RendererInterface; use Drupal\Core\Link; +use Drupal\Core\Render\RendererInterface; use Drupal\Core\Url; use Drupal\node\NodeInterface; use Drupal\va_gov_backend\Service\VaGovUrlInterface; diff --git a/docroot/modules/custom/va_gov_backend/src/EventSubscriber/ThemeEventSubscriber.php b/docroot/modules/custom/va_gov_backend/src/EventSubscriber/ThemeEventSubscriber.php index 25c7d0a564..d3b8ab3f77 100644 --- a/docroot/modules/custom/va_gov_backend/src/EventSubscriber/ThemeEventSubscriber.php +++ b/docroot/modules/custom/va_gov_backend/src/EventSubscriber/ThemeEventSubscriber.php @@ -3,10 +3,10 @@ namespace Drupal\va_gov_backend\EventSubscriber; use Drupal\Core\Render\Element; -use Drupal\core_event_dispatcher\Event\Theme\ThemeSuggestionsAlterEvent; -use Drupal\core_event_dispatcher\ThemeHookEvents; use Drupal\core_event_dispatcher\Event\Form\FormAlterEvent; +use Drupal\core_event_dispatcher\Event\Theme\ThemeSuggestionsAlterEvent; use Drupal\core_event_dispatcher\FormHookEvents; +use Drupal\core_event_dispatcher\ThemeHookEvents; use Drupal\field_event_dispatcher\Event\Field\WidgetSingleElementFormAlterEvent; use Drupal\field_event_dispatcher\FieldHookEvents; use Drupal\image\Plugin\Field\FieldWidget\ImageWidget; diff --git a/docroot/modules/custom/va_gov_backend/src/Form/ExclusionTypesAdminForm.php b/docroot/modules/custom/va_gov_backend/src/Form/ExclusionTypesAdminForm.php index 7ef9f2271e..f8fc2783e4 100644 --- a/docroot/modules/custom/va_gov_backend/src/Form/ExclusionTypesAdminForm.php +++ b/docroot/modules/custom/va_gov_backend/src/Form/ExclusionTypesAdminForm.php @@ -2,10 +2,10 @@ namespace Drupal\va_gov_backend\Form; -use Symfony\Component\DependencyInjection\ContainerInterface; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Form\FormBase; use Drupal\Core\Form\FormStateInterface; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * Class ExclusionTypesAdminForm. diff --git a/docroot/modules/custom/va_gov_backend/src/Plugin/field_group/FieldGroupFormatter/Tooltip.php b/docroot/modules/custom/va_gov_backend/src/Plugin/field_group/FieldGroupFormatter/Tooltip.php index 3a79cfcf37..4473f06d3c 100644 --- a/docroot/modules/custom/va_gov_backend/src/Plugin/field_group/FieldGroupFormatter/Tooltip.php +++ b/docroot/modules/custom/va_gov_backend/src/Plugin/field_group/FieldGroupFormatter/Tooltip.php @@ -2,8 +2,8 @@ namespace Drupal\va_gov_backend\Plugin\field_group\FieldGroupFormatter; -use Drupal\field_group\Plugin\field_group\FieldGroupFormatter\HtmlElement; use Drupal\Component\Utility\Html; +use Drupal\field_group\Plugin\field_group\FieldGroupFormatter\HtmlElement; /** * Tooltip field group formatter. diff --git a/docroot/modules/custom/va_gov_backend/src/Plugin/views/access/PdfAuditAccess.php b/docroot/modules/custom/va_gov_backend/src/Plugin/views/access/PdfAuditAccess.php index b6706e8b42..8b17963f8c 100644 --- a/docroot/modules/custom/va_gov_backend/src/Plugin/views/access/PdfAuditAccess.php +++ b/docroot/modules/custom/va_gov_backend/src/Plugin/views/access/PdfAuditAccess.php @@ -2,8 +2,8 @@ namespace Drupal\va_gov_backend\Plugin\views\access; -use Drupal\views\Plugin\views\access\AccessPluginBase; use Drupal\Core\Session\AccountInterface; +use Drupal\views\Plugin\views\access\AccessPluginBase; use Symfony\Component\Routing\Route; /** diff --git a/docroot/modules/custom/va_gov_banner/src/Plugin/Validation/Constraint/RequireScopeValidator.php b/docroot/modules/custom/va_gov_banner/src/Plugin/Validation/Constraint/RequireScopeValidator.php index 12838b8b89..89cf9b9018 100644 --- a/docroot/modules/custom/va_gov_banner/src/Plugin/Validation/Constraint/RequireScopeValidator.php +++ b/docroot/modules/custom/va_gov_banner/src/Plugin/Validation/Constraint/RequireScopeValidator.php @@ -4,9 +4,9 @@ use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\va_gov_user\Service\UserPermsService; +use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\ConstraintValidator; -use Symfony\Component\DependencyInjection\ContainerInterface; /** * Validates the RequireScope constraint. diff --git a/docroot/modules/custom/va_gov_build_trigger/src/Commands/SiteStatusCommands.php b/docroot/modules/custom/va_gov_build_trigger/src/Commands/SiteStatusCommands.php index 6418ec1bf0..64dd3fbe8a 100644 --- a/docroot/modules/custom/va_gov_build_trigger/src/Commands/SiteStatusCommands.php +++ b/docroot/modules/custom/va_gov_build_trigger/src/Commands/SiteStatusCommands.php @@ -2,8 +2,8 @@ namespace Drupal\va_gov_build_trigger\Commands; -use Drush\Commands\DrushCommands; use Drupal\va_gov_build_trigger\SiteStatus\SiteStatusInterface; +use Drush\Commands\DrushCommands; /** * A Drush interface to the Site Status service. diff --git a/docroot/modules/custom/va_gov_build_trigger/src/Controller/ContentReleaseNotificationController.php b/docroot/modules/custom/va_gov_build_trigger/src/Controller/ContentReleaseNotificationController.php index ccaa1a905c..944dd63a9b 100644 --- a/docroot/modules/custom/va_gov_build_trigger/src/Controller/ContentReleaseNotificationController.php +++ b/docroot/modules/custom/va_gov_build_trigger/src/Controller/ContentReleaseNotificationController.php @@ -3,10 +3,10 @@ namespace Drupal\va_gov_build_trigger\Controller; use Drupal\Core\Controller\ControllerBase; -use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\HttpFoundation\Response; use Drupal\va_gov_build_trigger\Service\ReleaseStateManager; use Drupal\va_gov_build_trigger\Service\ReleaseStateManagerInterface; +use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Component\HttpFoundation\Response; /** * Handles content release notifications. diff --git a/docroot/modules/custom/va_gov_build_trigger/src/EventSubscriber/ContentReleaseIntervalSubscriber.php b/docroot/modules/custom/va_gov_build_trigger/src/EventSubscriber/ContentReleaseIntervalSubscriber.php index d327a291ad..f771d3faf3 100644 --- a/docroot/modules/custom/va_gov_build_trigger/src/EventSubscriber/ContentReleaseIntervalSubscriber.php +++ b/docroot/modules/custom/va_gov_build_trigger/src/EventSubscriber/ContentReleaseIntervalSubscriber.php @@ -4,8 +4,8 @@ use Drupal\Component\Datetime\TimeInterface; use Drupal\Core\State\StateInterface; -use Drupal\va_gov_build_trigger\Plugin\MetricsCollector\ContentReleaseInterval; use Drupal\va_gov_build_trigger\Event\ReleaseStateTransitionEvent; +use Drupal\va_gov_build_trigger\Plugin\MetricsCollector\ContentReleaseInterval; use Drupal\va_gov_build_trigger\Service\ReleaseStateManager; use Symfony\Component\EventDispatcher\EventSubscriberInterface; diff --git a/docroot/modules/custom/va_gov_build_trigger/src/Form/PreviewForm.php b/docroot/modules/custom/va_gov_build_trigger/src/Form/PreviewForm.php index d7898f2ec7..4822d38c16 100644 --- a/docroot/modules/custom/va_gov_build_trigger/src/Form/PreviewForm.php +++ b/docroot/modules/custom/va_gov_build_trigger/src/Form/PreviewForm.php @@ -2,10 +2,10 @@ namespace Drupal\va_gov_build_trigger\Form; -use Drupal\Core\Form\FormBase; -use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Ajax\AjaxResponse; use Drupal\Core\Ajax\OpenModalDialogCommand; +use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\node\NodeInterface; /** diff --git a/docroot/modules/custom/va_gov_build_trigger/src/Plugin/AdvancedQueue/JobType/ReleaseDispatch.php b/docroot/modules/custom/va_gov_build_trigger/src/Plugin/AdvancedQueue/JobType/ReleaseDispatch.php index 4822159f31..eb9ccb5832 100644 --- a/docroot/modules/custom/va_gov_build_trigger/src/Plugin/AdvancedQueue/JobType/ReleaseDispatch.php +++ b/docroot/modules/custom/va_gov_build_trigger/src/Plugin/AdvancedQueue/JobType/ReleaseDispatch.php @@ -8,10 +8,10 @@ use Drupal\Core\Logger\LoggerChannelFactoryInterface; use Drupal\Core\Logger\LoggerChannelTrait; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; +use Drupal\va_gov_build_trigger\Environment\EnvironmentDiscovery; use Drupal\va_gov_build_trigger\Service\ReleaseStateManager; use Drupal\va_gov_build_trigger\Service\ReleaseStateManagerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; -use Drupal\va_gov_build_trigger\Environment\EnvironmentDiscovery; /** * AdvancedQueue queue processor plugin for content release dispatch. diff --git a/docroot/modules/custom/va_gov_build_trigger/src/Plugin/MetricsCollector/TimeSinceLastContentRelease.php b/docroot/modules/custom/va_gov_build_trigger/src/Plugin/MetricsCollector/TimeSinceLastContentRelease.php index 32c958edde..f27fcd5cf4 100644 --- a/docroot/modules/custom/va_gov_build_trigger/src/Plugin/MetricsCollector/TimeSinceLastContentRelease.php +++ b/docroot/modules/custom/va_gov_build_trigger/src/Plugin/MetricsCollector/TimeSinceLastContentRelease.php @@ -3,8 +3,8 @@ namespace Drupal\va_gov_build_trigger\Plugin\MetricsCollector; use Drupal\Component\Datetime\TimeInterface; -use Drupal\va_gov_build_trigger\Service\ReleaseStateManager; use Drupal\Core\State\StateInterface; +use Drupal\va_gov_build_trigger\Service\ReleaseStateManager; use Symfony\Component\DependencyInjection\ContainerInterface; /** diff --git a/docroot/modules/custom/va_gov_build_trigger/src/Plugin/MetricsCollector/TimeSinceLastContentReleaseError.php b/docroot/modules/custom/va_gov_build_trigger/src/Plugin/MetricsCollector/TimeSinceLastContentReleaseError.php index 62cdb96ed7..7fa7311415 100644 --- a/docroot/modules/custom/va_gov_build_trigger/src/Plugin/MetricsCollector/TimeSinceLastContentReleaseError.php +++ b/docroot/modules/custom/va_gov_build_trigger/src/Plugin/MetricsCollector/TimeSinceLastContentReleaseError.php @@ -3,8 +3,8 @@ namespace Drupal\va_gov_build_trigger\Plugin\MetricsCollector; use Drupal\Component\Datetime\TimeInterface; -use Drupal\va_gov_build_trigger\Service\ReleaseStateManager; use Drupal\Core\State\StateInterface; +use Drupal\va_gov_build_trigger\Service\ReleaseStateManager; use Symfony\Component\DependencyInjection\ContainerInterface; /** diff --git a/docroot/modules/custom/va_gov_bulk/src/Service/ModerationActions.php b/docroot/modules/custom/va_gov_bulk/src/Service/ModerationActions.php index 3bcb638f01..4b8a222202 100644 --- a/docroot/modules/custom/va_gov_bulk/src/Service/ModerationActions.php +++ b/docroot/modules/custom/va_gov_bulk/src/Service/ModerationActions.php @@ -2,9 +2,9 @@ namespace Drupal\va_gov_bulk\Service; -use Drupal\Core\Session\AccountProxyInterface; use Drupal\Component\Datetime\TimeInterface; use Drupal\Core\Entity\EntityTypeManagerInterface; +use Drupal\Core\Session\AccountProxyInterface; use Drupal\node\NodeInterface; /** diff --git a/docroot/modules/custom/va_gov_clone/src/CloneEntityFinder/CloneEntityFinderDiscovery.php b/docroot/modules/custom/va_gov_clone/src/CloneEntityFinder/CloneEntityFinderDiscovery.php index 242a232ba9..d51d834042 100644 --- a/docroot/modules/custom/va_gov_clone/src/CloneEntityFinder/CloneEntityFinderDiscovery.php +++ b/docroot/modules/custom/va_gov_clone/src/CloneEntityFinder/CloneEntityFinderDiscovery.php @@ -2,9 +2,9 @@ namespace Drupal\va_gov_clone\CloneEntityFinder; -use Drupal\Core\Plugin\DefaultPluginManager; use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Extension\ModuleHandlerInterface; +use Drupal\Core\Plugin\DefaultPluginManager; /** * Provides the Clone handler plugin manager. diff --git a/docroot/modules/custom/va_gov_clone/src/CloneManager.php b/docroot/modules/custom/va_gov_clone/src/CloneManager.php index d02afe6899..76ba3e45cf 100644 --- a/docroot/modules/custom/va_gov_clone/src/CloneManager.php +++ b/docroot/modules/custom/va_gov_clone/src/CloneManager.php @@ -2,12 +2,12 @@ namespace Drupal\va_gov_clone; -use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\entity_clone\Event\EntityCloneEvent; use Drupal\entity_clone\Event\EntityCloneEvents; use Drupal\va_gov_clone\CloneEntityFinder\CloneEntityFinderDiscovery; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; /** * The Clone Manager to clone content. diff --git a/docroot/modules/custom/va_gov_content_release/src/EntityEvent/Strategy/Resolver/Resolver.php b/docroot/modules/custom/va_gov_content_release/src/EntityEvent/Strategy/Resolver/Resolver.php index 056e38afaa..18fc10cdaa 100644 --- a/docroot/modules/custom/va_gov_content_release/src/EntityEvent/Strategy/Resolver/Resolver.php +++ b/docroot/modules/custom/va_gov_content_release/src/EntityEvent/Strategy/Resolver/Resolver.php @@ -2,8 +2,8 @@ namespace Drupal\va_gov_content_release\EntityEvent\Strategy\Resolver; -use Drupal\va_gov_environment\Discovery\DiscoveryInterface; use Drupal\va_gov_content_release\Exception\CouldNotDetermineStrategyException; +use Drupal\va_gov_environment\Discovery\DiscoveryInterface; /** * The strategy resolver service. diff --git a/docroot/modules/custom/va_gov_content_release/src/Form/Resolver/Resolver.php b/docroot/modules/custom/va_gov_content_release/src/Form/Resolver/Resolver.php index 52f8a0cd2f..81d0c4f737 100644 --- a/docroot/modules/custom/va_gov_content_release/src/Form/Resolver/Resolver.php +++ b/docroot/modules/custom/va_gov_content_release/src/Form/Resolver/Resolver.php @@ -2,9 +2,9 @@ namespace Drupal\va_gov_content_release\Form\Resolver; +use Drupal\va_gov_content_release\Exception\CouldNotDetermineFormException; use Drupal\va_gov_content_release\Form\GitForm; use Drupal\va_gov_content_release\Form\SimpleForm; -use Drupal\va_gov_content_release\Exception\CouldNotDetermineFormException; use Drupal\va_gov_environment\Discovery\DiscoveryInterface; /** diff --git a/docroot/modules/custom/va_gov_content_release/src/GitHub/GitHubRepositoryDispatch.php b/docroot/modules/custom/va_gov_content_release/src/GitHub/GitHubRepositoryDispatch.php index 8c4e0a9fae..56fff71f08 100644 --- a/docroot/modules/custom/va_gov_content_release/src/GitHub/GitHubRepositoryDispatch.php +++ b/docroot/modules/custom/va_gov_content_release/src/GitHub/GitHubRepositoryDispatch.php @@ -2,9 +2,9 @@ namespace Drupal\va_gov_content_release\GitHub; -use Drupal\va_gov_github\Api\Client\ApiClientInterface; use Drupal\va_gov_content_release\Exception\ContentReleaseInProgressException; use Drupal\va_gov_content_release\Exception\GitHubRepositoryDispatchException; +use Drupal\va_gov_github\Api\Client\ApiClientInterface; /** * The GitHub repository dispatch service. diff --git a/docroot/modules/custom/va_gov_content_release/src/LocalFilesystem/LocalFilesystemBuildFile.php b/docroot/modules/custom/va_gov_content_release/src/LocalFilesystem/LocalFilesystemBuildFile.php index adb93a2eab..e597910b4c 100644 --- a/docroot/modules/custom/va_gov_content_release/src/LocalFilesystem/LocalFilesystemBuildFile.php +++ b/docroot/modules/custom/va_gov_content_release/src/LocalFilesystem/LocalFilesystemBuildFile.php @@ -2,8 +2,8 @@ namespace Drupal\va_gov_content_release\LocalFilesystem; -use Drupal\Core\File\FileSystemInterface; use Drupal\Core\File\Exception\FileException; +use Drupal\Core\File\FileSystemInterface; use Drupal\va_gov_content_release\Exception\StrategyErrorException; /** diff --git a/docroot/modules/custom/va_gov_content_release/src/Plugin/EntityEventStrategy/ExceptionTest.php b/docroot/modules/custom/va_gov_content_release/src/Plugin/EntityEventStrategy/ExceptionTest.php index 106fb8eb29..febaca13c1 100644 --- a/docroot/modules/custom/va_gov_content_release/src/Plugin/EntityEventStrategy/ExceptionTest.php +++ b/docroot/modules/custom/va_gov_content_release/src/Plugin/EntityEventStrategy/ExceptionTest.php @@ -2,8 +2,8 @@ namespace Drupal\va_gov_content_release\Plugin\EntityEventStrategy; -use Drupal\va_gov_content_release\Exception\StrategyErrorException; use Drupal\va_gov_content_release\EntityEvent\Strategy\Plugin\StrategyPluginBase; +use Drupal\va_gov_content_release\Exception\StrategyErrorException; use Drupal\va_gov_content_types\Entity\VaNodeInterface; /** diff --git a/docroot/modules/custom/va_gov_content_release/src/Request/Request.php b/docroot/modules/custom/va_gov_content_release/src/Request/Request.php index 21cfa1955f..50df919898 100644 --- a/docroot/modules/custom/va_gov_content_release/src/Request/Request.php +++ b/docroot/modules/custom/va_gov_content_release/src/Request/Request.php @@ -2,8 +2,8 @@ namespace Drupal\va_gov_content_release\Request; -use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\advancedqueue\Job; +use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\va_gov_content_release\Exception\RequestException; /** diff --git a/docroot/modules/custom/va_gov_events/src/Form/SmartDateOverrideForm.php b/docroot/modules/custom/va_gov_events/src/Form/SmartDateOverrideForm.php index c4484cd920..078c43a646 100644 --- a/docroot/modules/custom/va_gov_events/src/Form/SmartDateOverrideForm.php +++ b/docroot/modules/custom/va_gov_events/src/Form/SmartDateOverrideForm.php @@ -15,8 +15,8 @@ use Drupal\Core\Url; use Drupal\field\Entity\FieldConfig; use Drupal\smart_date\Plugin\Field\FieldWidget\SmartDateWidgetBase; -use Drupal\va_gov_events\Controller\Instances; use Drupal\smart_date_recur\Entity\SmartDateOverride; +use Drupal\va_gov_events\Controller\Instances; use Symfony\Component\DependencyInjection\ContainerInterface; /** diff --git a/docroot/modules/custom/va_gov_flags/src/Controller/VaGovFlagsController.php b/docroot/modules/custom/va_gov_flags/src/Controller/VaGovFlagsController.php index a622536962..92eec6d90e 100644 --- a/docroot/modules/custom/va_gov_flags/src/Controller/VaGovFlagsController.php +++ b/docroot/modules/custom/va_gov_flags/src/Controller/VaGovFlagsController.php @@ -2,8 +2,8 @@ namespace Drupal\va_gov_flags\Controller; -use Drupal\va_gov_flags\FeatureFlagDataBuilder; use Drupal\Core\DependencyInjection\ContainerInjectionInterface; +use Drupal\va_gov_flags\FeatureFlagDataBuilder; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\JsonResponse; diff --git a/docroot/modules/custom/va_gov_git/src/BranchSearch/BranchSearch.php b/docroot/modules/custom/va_gov_git/src/BranchSearch/BranchSearch.php index 6432254b77..a6ed932caa 100644 --- a/docroot/modules/custom/va_gov_git/src/BranchSearch/BranchSearch.php +++ b/docroot/modules/custom/va_gov_git/src/BranchSearch/BranchSearch.php @@ -2,8 +2,8 @@ namespace Drupal\va_gov_git\BranchSearch; -use Drupal\va_gov_git\Repository\RepositoryInterface; use Drupal\Core\Logger\LoggerChannelFactoryInterface; +use Drupal\va_gov_git\Repository\RepositoryInterface; /** * The branch search service. diff --git a/docroot/modules/custom/va_gov_git/src/Commands/RepositoryCommands.php b/docroot/modules/custom/va_gov_git/src/Commands/RepositoryCommands.php index f5dc27417d..f1a1298123 100644 --- a/docroot/modules/custom/va_gov_git/src/Commands/RepositoryCommands.php +++ b/docroot/modules/custom/va_gov_git/src/Commands/RepositoryCommands.php @@ -2,8 +2,8 @@ namespace Drupal\va_gov_git\Commands; -use Drupal\va_gov_git\BranchSearch\Factory\BranchSearchFactoryInterface; use Drupal\va_gov_git\BranchSearch\BranchSearchInterface; +use Drupal\va_gov_git\BranchSearch\Factory\BranchSearchFactoryInterface; use Drupal\va_gov_git\Repository\Factory\RepositoryFactoryInterface; use Drupal\va_gov_git\Repository\RepositoryInterface; use Drush\Commands\DrushCommands; diff --git a/docroot/modules/custom/va_gov_github/src/Commands/ApiClientCommands.php b/docroot/modules/custom/va_gov_github/src/Commands/ApiClientCommands.php index ff574ebf07..8fb94eb6b3 100644 --- a/docroot/modules/custom/va_gov_github/src/Commands/ApiClientCommands.php +++ b/docroot/modules/custom/va_gov_github/src/Commands/ApiClientCommands.php @@ -2,8 +2,8 @@ namespace Drupal\va_gov_github\Commands; -use Drupal\va_gov_github\Api\Client\Factory\ApiClientFactoryInterface; use Drupal\va_gov_github\Api\Client\ApiClientInterface; +use Drupal\va_gov_github\Api\Client\Factory\ApiClientFactoryInterface; use Drush\Commands\DrushCommands; /** diff --git a/docroot/modules/custom/va_gov_lovell/src/EventSubscriber/LovellEventSubscriber.php b/docroot/modules/custom/va_gov_lovell/src/EventSubscriber/LovellEventSubscriber.php index 26c38de5b8..4fd666842a 100644 --- a/docroot/modules/custom/va_gov_lovell/src/EventSubscriber/LovellEventSubscriber.php +++ b/docroot/modules/custom/va_gov_lovell/src/EventSubscriber/LovellEventSubscriber.php @@ -2,12 +2,6 @@ namespace Drupal\va_gov_lovell\EventSubscriber; -use Drupal\core_event_dispatcher\EntityHookEvents; -use Drupal\core_event_dispatcher\Event\Entity\EntityAccessEvent; -use Drupal\core_event_dispatcher\Event\Entity\EntityInsertEvent; -use Drupal\core_event_dispatcher\Event\Entity\EntityPresaveEvent; -use Drupal\core_event_dispatcher\Event\Entity\EntityUpdateEvent; -use Drupal\core_event_dispatcher\Event\Form\FormIdAlterEvent; use Drupal\Core\Access\AccessResult; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityTypeManager; @@ -15,6 +9,12 @@ use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\Session\AccountInterface; use Drupal\Core\StringTranslation\StringTranslationTrait; +use Drupal\core_event_dispatcher\EntityHookEvents; +use Drupal\core_event_dispatcher\Event\Entity\EntityAccessEvent; +use Drupal\core_event_dispatcher\Event\Entity\EntityInsertEvent; +use Drupal\core_event_dispatcher\Event\Entity\EntityPresaveEvent; +use Drupal\core_event_dispatcher\Event\Entity\EntityUpdateEvent; +use Drupal\core_event_dispatcher\Event\Form\FormIdAlterEvent; use Drupal\menu_link_content\MenuLinkContentInterface; use Drupal\node\NodeInterface; use Drupal\path_alias\Entity\PathAlias; diff --git a/docroot/modules/custom/va_gov_lovell/src/Variables/BreadcrumbEventVariables.php b/docroot/modules/custom/va_gov_lovell/src/Variables/BreadcrumbEventVariables.php index e8837f183b..71dd07770d 100644 --- a/docroot/modules/custom/va_gov_lovell/src/Variables/BreadcrumbEventVariables.php +++ b/docroot/modules/custom/va_gov_lovell/src/Variables/BreadcrumbEventVariables.php @@ -2,9 +2,8 @@ namespace Drupal\va_gov_lovell\Variables; -use Drupal\preprocess_event_dispatcher\Variables\AbstractEventVariables; - use Drupal\Core\Entity\EntityInterface; +use Drupal\preprocess_event_dispatcher\Variables\AbstractEventVariables; /** * Wrapper class for breadcrumb preprocess event variables. diff --git a/docroot/modules/custom/va_gov_menu_access/src/Access/RouteAccessChecks.php b/docroot/modules/custom/va_gov_menu_access/src/Access/RouteAccessChecks.php index b561dfe355..99cc9c4064 100644 --- a/docroot/modules/custom/va_gov_menu_access/src/Access/RouteAccessChecks.php +++ b/docroot/modules/custom/va_gov_menu_access/src/Access/RouteAccessChecks.php @@ -3,13 +3,13 @@ namespace Drupal\va_gov_menu_access\Access; use Drupal\Core\Access\AccessResult; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Routing\Access\AccessInterface; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\Session\AccountInterface; use Drupal\va_gov_user\Service\UserPermsService; -use Symfony\Component\Routing\Route; use Symfony\Component\DependencyInjection\ContainerInterface; -use Drupal\Core\DependencyInjection\ContainerInjectionInterface; +use Symfony\Component\Routing\Route; /** * Determines access rules for particular routes. diff --git a/docroot/modules/custom/va_gov_menu_access/src/Service/MenuReductionService.php b/docroot/modules/custom/va_gov_menu_access/src/Service/MenuReductionService.php index e3f477b4c0..4e23518c84 100644 --- a/docroot/modules/custom/va_gov_menu_access/src/Service/MenuReductionService.php +++ b/docroot/modules/custom/va_gov_menu_access/src/Service/MenuReductionService.php @@ -8,8 +8,8 @@ use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\node\NodeForm; use Drupal\path_alias\AliasManagerInterface; -use Drupal\va_gov_user\Service\UserPermsService; use Drupal\va_gov_lovell\LovellOps; +use Drupal\va_gov_user\Service\UserPermsService; /** * Class MenuReductionService a service for reducing possible menu items. diff --git a/docroot/modules/custom/va_gov_migrate/src/EventSubscriber/MessageLogger.php b/docroot/modules/custom/va_gov_migrate/src/EventSubscriber/MessageLogger.php index 5ad46ae3a5..45bf273a87 100644 --- a/docroot/modules/custom/va_gov_migrate/src/EventSubscriber/MessageLogger.php +++ b/docroot/modules/custom/va_gov_migrate/src/EventSubscriber/MessageLogger.php @@ -2,12 +2,12 @@ namespace Drupal\va_gov_migrate\EventSubscriber; +use Drupal\Core\File\FileUrlGeneratorInterface; +use Drupal\Core\State\StateInterface; use Drupal\migrate\Event\MigrateEvents; use Drupal\migrate\Event\MigrateImportEvent; use Drupal\migration_tools\Event\MessageEvent; use Drupal\migration_tools\Message; -use Drupal\Core\File\FileUrlGeneratorInterface; -use Drupal\Core\State\StateInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; /** diff --git a/docroot/modules/custom/va_gov_migrate/src/EventSubscriber/PostRowSave.php b/docroot/modules/custom/va_gov_migrate/src/EventSubscriber/PostRowSave.php index 08cd9d38ea..ae652b58bf 100644 --- a/docroot/modules/custom/va_gov_migrate/src/EventSubscriber/PostRowSave.php +++ b/docroot/modules/custom/va_gov_migrate/src/EventSubscriber/PostRowSave.php @@ -3,12 +3,12 @@ namespace Drupal\va_gov_migrate\EventSubscriber; use Drupal\menu_link_content\Entity\MenuLinkContent; -use Drupal\migration_tools\Message; -use Symfony\Component\EventDispatcher\EventSubscriberInterface; -use Drupal\va_gov_migrate\ParagraphMigrator; -use Drupal\migrate\Event\MigratePostRowSaveEvent; use Drupal\migrate\Event\MigrateEvents; +use Drupal\migrate\Event\MigratePostRowSaveEvent; +use Drupal\migration_tools\Message; use Drupal\node\Entity\Node; +use Drupal\va_gov_migrate\ParagraphMigrator; +use Symfony\Component\EventDispatcher\EventSubscriberInterface; /** * Add paragraphs to node after save. diff --git a/docroot/modules/custom/va_gov_migrate/src/EventSubscriber/PrepareRow.php b/docroot/modules/custom/va_gov_migrate/src/EventSubscriber/PrepareRow.php index 117d5427ab..1cd47238f4 100644 --- a/docroot/modules/custom/va_gov_migrate/src/EventSubscriber/PrepareRow.php +++ b/docroot/modules/custom/va_gov_migrate/src/EventSubscriber/PrepareRow.php @@ -3,9 +3,9 @@ namespace Drupal\va_gov_migrate\EventSubscriber; use Drupal\migrate\MigrateSkipRowException; -use Symfony\Component\EventDispatcher\EventSubscriberInterface; -use Drupal\migrate_plus\Event\MigratePrepareRowEvent; use Drupal\migrate_plus\Event\MigrateEvents; +use Drupal\migrate_plus\Event\MigratePrepareRowEvent; +use Symfony\Component\EventDispatcher\EventSubscriberInterface; /** * Add paragraphs to node after save. diff --git a/docroot/modules/custom/va_gov_migrate/src/Paragraph/CollapsiblePanel.php b/docroot/modules/custom/va_gov_migrate/src/Paragraph/CollapsiblePanel.php index 3a4b4bb20e..4538ac1304 100644 --- a/docroot/modules/custom/va_gov_migrate/src/Paragraph/CollapsiblePanel.php +++ b/docroot/modules/custom/va_gov_migrate/src/Paragraph/CollapsiblePanel.php @@ -2,9 +2,9 @@ namespace Drupal\va_gov_migrate\Paragraph; +use Drupal\migration_tools\Message; use Drupal\va_gov_migrate\ParagraphType; use QueryPath\DOMQuery; -use Drupal\migration_tools\Message; /** * Starred Horizontal Rule paragraph type. diff --git a/docroot/modules/custom/va_gov_migrate/src/Paragraph/CollapsiblePanelItem.php b/docroot/modules/custom/va_gov_migrate/src/Paragraph/CollapsiblePanelItem.php index 868f23b4c0..5b1b0e3a7c 100644 --- a/docroot/modules/custom/va_gov_migrate/src/Paragraph/CollapsiblePanelItem.php +++ b/docroot/modules/custom/va_gov_migrate/src/Paragraph/CollapsiblePanelItem.php @@ -2,10 +2,10 @@ namespace Drupal\va_gov_migrate\Paragraph; +use Drupal\migration_tools\Message; use Drupal\paragraphs\Entity\Paragraph; use Drupal\va_gov_migrate\ParagraphType; use QueryPath\DOMQuery; -use Drupal\migration_tools\Message; /** * Starred Horizontal Rule paragraph type. diff --git a/docroot/modules/custom/va_gov_migrate/src/Paragraph/LinksListItem.php b/docroot/modules/custom/va_gov_migrate/src/Paragraph/LinksListItem.php index bc4d2004d9..c276248b78 100644 --- a/docroot/modules/custom/va_gov_migrate/src/Paragraph/LinksListItem.php +++ b/docroot/modules/custom/va_gov_migrate/src/Paragraph/LinksListItem.php @@ -2,10 +2,10 @@ namespace Drupal\va_gov_migrate\Paragraph; -use Drupal\va_gov_migrate\ParagraphType; -use QueryPath\DOMQuery; use Drupal\migration_tools\Message; use Drupal\migration_tools\StringTools; +use Drupal\va_gov_migrate\ParagraphType; +use QueryPath\DOMQuery; /** * Link list item paragraph type. diff --git a/docroot/modules/custom/va_gov_migrate/src/Paragraph/NumberCallout.php b/docroot/modules/custom/va_gov_migrate/src/Paragraph/NumberCallout.php index bee7de3d3a..94abc6e2ad 100644 --- a/docroot/modules/custom/va_gov_migrate/src/Paragraph/NumberCallout.php +++ b/docroot/modules/custom/va_gov_migrate/src/Paragraph/NumberCallout.php @@ -2,9 +2,9 @@ namespace Drupal\va_gov_migrate\Paragraph; +use Drupal\migration_tools\Message; use Drupal\va_gov_migrate\ParagraphType; use QueryPath\DOMQuery; -use Drupal\migration_tools\Message; /** * NumberCallout paragraph migration. diff --git a/docroot/modules/custom/va_gov_migrate/src/Paragraph/Process.php b/docroot/modules/custom/va_gov_migrate/src/Paragraph/Process.php index aee73256ef..15da2f0eee 100644 --- a/docroot/modules/custom/va_gov_migrate/src/Paragraph/Process.php +++ b/docroot/modules/custom/va_gov_migrate/src/Paragraph/Process.php @@ -2,9 +2,9 @@ namespace Drupal\va_gov_migrate\Paragraph; +use Drupal\migration_tools\Message; use Drupal\va_gov_migrate\ParagraphType; use QueryPath\DOMQuery; -use Drupal\migration_tools\Message; /** * Process paragraph type. diff --git a/docroot/modules/custom/va_gov_migrate/src/Paragraph/QAAccordion.php b/docroot/modules/custom/va_gov_migrate/src/Paragraph/QAAccordion.php index 31eaf1cda2..ac06cc4c37 100644 --- a/docroot/modules/custom/va_gov_migrate/src/Paragraph/QAAccordion.php +++ b/docroot/modules/custom/va_gov_migrate/src/Paragraph/QAAccordion.php @@ -2,11 +2,11 @@ namespace Drupal\va_gov_migrate\Paragraph; +use Drupal\migration_tools\Message; use Drupal\paragraphs\Entity\Paragraph; use Drupal\va_gov_migrate\AnomalyMessage; use Drupal\va_gov_migrate\Paragraph\Base\QABase; use QueryPath\DOMQuery; -use Drupal\migration_tools\Message; /** * For converting accordions to Q&A paragraphs. diff --git a/docroot/modules/custom/va_gov_migrate/src/Paragraph/QASchema.php b/docroot/modules/custom/va_gov_migrate/src/Paragraph/QASchema.php index 16ac45ec11..21e66b7eb8 100644 --- a/docroot/modules/custom/va_gov_migrate/src/Paragraph/QASchema.php +++ b/docroot/modules/custom/va_gov_migrate/src/Paragraph/QASchema.php @@ -2,10 +2,10 @@ namespace Drupal\va_gov_migrate\Paragraph; +use Drupal\migration_tools\Message; use Drupal\paragraphs\Entity\Paragraph; use Drupal\va_gov_migrate\Paragraph\Base\QABase; use QueryPath\DOMQuery; -use Drupal\migration_tools\Message; /** * Q&A Paragraph type. diff --git a/docroot/modules/custom/va_gov_migrate/src/Paragraph/ReactWidget.php b/docroot/modules/custom/va_gov_migrate/src/Paragraph/ReactWidget.php index 06e96dec56..06d0a5552d 100644 --- a/docroot/modules/custom/va_gov_migrate/src/Paragraph/ReactWidget.php +++ b/docroot/modules/custom/va_gov_migrate/src/Paragraph/ReactWidget.php @@ -2,10 +2,10 @@ namespace Drupal\va_gov_migrate\Paragraph; +use Drupal\migration_tools\Message; use Drupal\va_gov_migrate\AnomalyMessage; use Drupal\va_gov_migrate\ParagraphType; use QueryPath\DOMQuery; -use Drupal\migration_tools\Message; /** * Migration for ReactWidget paragraphs. diff --git a/docroot/modules/custom/va_gov_migrate/src/ParagraphMigrator.php b/docroot/modules/custom/va_gov_migrate/src/ParagraphMigrator.php index db58529c77..895018d398 100644 --- a/docroot/modules/custom/va_gov_migrate/src/ParagraphMigrator.php +++ b/docroot/modules/custom/va_gov_migrate/src/ParagraphMigrator.php @@ -5,9 +5,9 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\migrate\Event\MigratePostRowSaveEvent; use Drupal\migrate\MigrateException; +use Drupal\migration_tools\Message; use Drupal\paragraphs\Entity\Paragraph; use QueryPath\DOMQuery; -use Drupal\migration_tools\Message; /** * ParagraphMigrator migrates paragraphs from query path. diff --git a/docroot/modules/custom/va_gov_migrate/src/ParagraphType.php b/docroot/modules/custom/va_gov_migrate/src/ParagraphType.php index e1d0b88ee6..d99572b8ad 100644 --- a/docroot/modules/custom/va_gov_migrate/src/ParagraphType.php +++ b/docroot/modules/custom/va_gov_migrate/src/ParagraphType.php @@ -2,9 +2,9 @@ namespace Drupal\va_gov_migrate; -use Drupal\paragraphs\Entity\Paragraph; use Drupal\Core\Entity\EntityInterface; use Drupal\migration_tools\Message; +use Drupal\paragraphs\Entity\Paragraph; use QueryPath\DOMQuery; /** diff --git a/docroot/modules/custom/va_gov_migrate/src/Plugin/migrate/process/VAFieldOfficeHours.php b/docroot/modules/custom/va_gov_migrate/src/Plugin/migrate/process/VAFieldOfficeHours.php index 10e4488f3a..b539f06df1 100644 --- a/docroot/modules/custom/va_gov_migrate/src/Plugin/migrate/process/VAFieldOfficeHours.php +++ b/docroot/modules/custom/va_gov_migrate/src/Plugin/migrate/process/VAFieldOfficeHours.php @@ -2,8 +2,8 @@ namespace Drupal\va_gov_migrate\Plugin\migrate\process; -use Drupal\migrate\ProcessPluginBase; use Drupal\migrate\MigrateExecutableInterface; +use Drupal\migrate\ProcessPluginBase; use Drupal\migrate\Row; /** diff --git a/docroot/modules/custom/va_gov_migrate/src/Plugin/migrate/source/AlertBlockSource.php b/docroot/modules/custom/va_gov_migrate/src/Plugin/migrate/source/AlertBlockSource.php index b1c6d5a2db..e292a9d7ea 100644 --- a/docroot/modules/custom/va_gov_migrate/src/Plugin/migrate/source/AlertBlockSource.php +++ b/docroot/modules/custom/va_gov_migrate/src/Plugin/migrate/source/AlertBlockSource.php @@ -2,12 +2,12 @@ namespace Drupal\va_gov_migrate\Plugin\migrate\source; +use Drupal\migrate\MigrateException; use Drupal\migration_tools\Message; -use QueryPath\DOMQuery; -use Drupal\migration_tools\StringTools; use Drupal\migration_tools\Obtainer\ObtainHtml; +use Drupal\migration_tools\StringTools; use Michelf\MarkdownExtra; -use Drupal\migrate\MigrateException; +use QueryPath\DOMQuery; /** * Gets blocks from pages referenced by metalsmith files. diff --git a/docroot/modules/custom/va_gov_migrate/src/Plugin/migrate/source/MetalsmithSource.php b/docroot/modules/custom/va_gov_migrate/src/Plugin/migrate/source/MetalsmithSource.php index d37604f6e3..629639c1bd 100644 --- a/docroot/modules/custom/va_gov_migrate/src/Plugin/migrate/source/MetalsmithSource.php +++ b/docroot/modules/custom/va_gov_migrate/src/Plugin/migrate/source/MetalsmithSource.php @@ -4,14 +4,14 @@ use Drupal\Core\Site\Settings; use Drupal\migrate\MigrateException; +use Drupal\migrate\Plugin\MigrationInterface; use Drupal\migration_tools\Message; use Drupal\migration_tools\Plugin\migrate\source\UrlList; use Drupal\migration_tools\StringTools; use Drupal\va_gov_migrate\AnomalyMessage; -use Symfony\Component\Yaml\Yaml; -use Symfony\Component\Yaml\Exception\ParseException; -use Drupal\migrate\Plugin\MigrationInterface; use GuzzleHttp\Exception\RequestException; +use Symfony\Component\Yaml\Exception\ParseException; +use Symfony\Component\Yaml\Yaml; /** * Gets frontmatter and page urls from metalsmith files. diff --git a/docroot/modules/custom/va_gov_multilingual/va_gov_multilingual.module b/docroot/modules/custom/va_gov_multilingual/va_gov_multilingual.module index 54e180a51d..cb2f31a204 100644 --- a/docroot/modules/custom/va_gov_multilingual/va_gov_multilingual.module +++ b/docroot/modules/custom/va_gov_multilingual/va_gov_multilingual.module @@ -10,8 +10,8 @@ use Drupal\Core\Form\FormStateInterface; use Drupal\textfield_counter\Plugin\Field\FieldWidget\StringTextareaWithCounterWidget; use Drupal\textfield_counter\Plugin\Field\FieldWidget\StringTextfieldWithCounterWidget; use Drupal\textfield_counter\Plugin\Field\FieldWidget\TextareaWithCounterWidget; -use Drupal\textfield_counter\Plugin\Field\FieldWidget\TextfieldWithSummaryAndCounterWidget; use Drupal\textfield_counter\Plugin\Field\FieldWidget\TextFieldWithCounterWidget; +use Drupal\textfield_counter\Plugin\Field\FieldWidget\TextfieldWithSummaryAndCounterWidget; /** * Implements hook_field_widget_single_element_form_alter(). diff --git a/docroot/modules/custom/va_gov_notifications/src/Plugin/AdvancedQueue/JobType/OutdatedContentNotification.php b/docroot/modules/custom/va_gov_notifications/src/Plugin/AdvancedQueue/JobType/OutdatedContentNotification.php index fd07a01a00..de5b3c8710 100644 --- a/docroot/modules/custom/va_gov_notifications/src/Plugin/AdvancedQueue/JobType/OutdatedContentNotification.php +++ b/docroot/modules/custom/va_gov_notifications/src/Plugin/AdvancedQueue/JobType/OutdatedContentNotification.php @@ -8,8 +8,8 @@ use Drupal\Core\Logger\LoggerChannelFactoryInterface; use Drupal\Core\Logger\LoggerChannelTrait; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; -use Drupal\message_notify\MessageNotifier; use Drupal\message\Entity\Message; +use Drupal\message_notify\MessageNotifier; use Symfony\Component\DependencyInjection\ContainerInterface; /** diff --git a/docroot/modules/custom/va_gov_notifications/src/Plugin/Notifier/Slack.php b/docroot/modules/custom/va_gov_notifications/src/Plugin/Notifier/Slack.php index 038aea30a4..dd6c6f0340 100644 --- a/docroot/modules/custom/va_gov_notifications/src/Plugin/Notifier/Slack.php +++ b/docroot/modules/custom/va_gov_notifications/src/Plugin/Notifier/Slack.php @@ -6,8 +6,8 @@ use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Logger\LoggerChannelInterface; use Drupal\Core\Render\RendererInterface; -use Drupal\message_notify\Plugin\Notifier\MessageNotifierBase; use Drupal\message\MessageInterface; +use Drupal\message_notify\Plugin\Notifier\MessageNotifierBase; use Drupal\slack\Slack as SlackService; use Psr\Http\Message\ResponseInterface; use Symfony\Component\DependencyInjection\ContainerInterface; diff --git a/docroot/modules/custom/va_gov_notifications/src/Service/NotificationsManager.php b/docroot/modules/custom/va_gov_notifications/src/Service/NotificationsManager.php index 4031b52fa8..4aeb49ef8b 100644 --- a/docroot/modules/custom/va_gov_notifications/src/Service/NotificationsManager.php +++ b/docroot/modules/custom/va_gov_notifications/src/Service/NotificationsManager.php @@ -3,8 +3,8 @@ namespace Drupal\va_gov_notifications\Service; use Drupal\Core\Entity\EntityTypeManagerInterface; -use Drupal\message_notify\MessageNotifier; use Drupal\message\Entity\Message; +use Drupal\message_notify\MessageNotifier; use Drupal\node\NodeInterface; /** diff --git a/docroot/modules/custom/va_gov_post_api/src/Form/VaGovFacilityForceQueueForm.php b/docroot/modules/custom/va_gov_post_api/src/Form/VaGovFacilityForceQueueForm.php index 71a0a6b6a8..23620ff2d8 100644 --- a/docroot/modules/custom/va_gov_post_api/src/Form/VaGovFacilityForceQueueForm.php +++ b/docroot/modules/custom/va_gov_post_api/src/Form/VaGovFacilityForceQueueForm.php @@ -2,9 +2,9 @@ namespace Drupal\va_gov_post_api\Form; +use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Form\FormBase; use Drupal\Core\Form\FormStateInterface; -use Drupal\Core\Entity\EntityTypeManagerInterface; use Psr\Log\LogLevel; use Symfony\Component\DependencyInjection\ContainerInterface; diff --git a/docroot/modules/custom/va_gov_preview/src/StaticServiceProvider.php b/docroot/modules/custom/va_gov_preview/src/StaticServiceProvider.php index d920f1d820..c28988e091 100644 --- a/docroot/modules/custom/va_gov_preview/src/StaticServiceProvider.php +++ b/docroot/modules/custom/va_gov_preview/src/StaticServiceProvider.php @@ -2,9 +2,9 @@ namespace Drupal\va_gov_preview; -use Drupal\Core\StackMiddleware\NegotiationMiddleware; use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\Core\DependencyInjection\ServiceModifierInterface; +use Drupal\Core\StackMiddleware\NegotiationMiddleware; /** * Adds application/static+html as known format. diff --git a/docroot/modules/custom/va_gov_profile/src/EventSubscriber/EntityEventSubscriber.php b/docroot/modules/custom/va_gov_profile/src/EventSubscriber/EntityEventSubscriber.php index a2e412a761..52538c5829 100644 --- a/docroot/modules/custom/va_gov_profile/src/EventSubscriber/EntityEventSubscriber.php +++ b/docroot/modules/custom/va_gov_profile/src/EventSubscriber/EntityEventSubscriber.php @@ -2,11 +2,11 @@ namespace Drupal\va_gov_profile\EventSubscriber; +use Drupal\Core\Entity\EntityTypeManager; +use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\core_event_dispatcher\EntityHookEvents; use Drupal\core_event_dispatcher\Event\Entity\EntityTypeAlterEvent; use Drupal\core_event_dispatcher\Event\Form\FormIdAlterEvent; -use Drupal\Core\Entity\EntityTypeManager; -use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\va_gov_user\Service\UserPermsService; use Symfony\Component\EventDispatcher\EventSubscriberInterface; diff --git a/docroot/modules/custom/va_gov_resources_and_support/va_gov_resources_and_support.deploy.php b/docroot/modules/custom/va_gov_resources_and_support/va_gov_resources_and_support.deploy.php index 8bfcf5091c..3845a21009 100644 --- a/docroot/modules/custom/va_gov_resources_and_support/va_gov_resources_and_support.deploy.php +++ b/docroot/modules/custom/va_gov_resources_and_support/va_gov_resources_and_support.deploy.php @@ -16,8 +16,8 @@ require_once __DIR__ . '/../../../../scripts/content/script-library.php'; use Drupal\node\Entity\Node; -use Psr\Log\LogLevel; use Drupal\taxonomy\Entity\Term; +use Psr\Log\LogLevel; /** * Migrate Publication field_benefits data to new field_lc_categories field. diff --git a/docroot/modules/custom/va_gov_user/src/EventSubscriber/UserImport.php b/docroot/modules/custom/va_gov_user/src/EventSubscriber/UserImport.php index 8b5aeee047..a0159dd9cc 100644 --- a/docroot/modules/custom/va_gov_user/src/EventSubscriber/UserImport.php +++ b/docroot/modules/custom/va_gov_user/src/EventSubscriber/UserImport.php @@ -3,15 +3,15 @@ namespace Drupal\va_gov_user\EventSubscriber; use Drupal\Core\Entity\EntityTypeManager; -use Drupal\hook_event_dispatcher\HookEventDispatcherModuleHandler; use Drupal\Core\Messenger\MessengerInterface; use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\Core\StringTranslation\TranslationInterface; use Drupal\externalauth\ExternalAuth; +use Drupal\hook_event_dispatcher\HookEventDispatcherModuleHandler; +use Drupal\migrate\Event\MigrateEvents; use Drupal\migrate\Event\MigrateImportEvent; use Drupal\migrate\Event\MigratePostRowSaveEvent; use Drupal\migrate\Event\MigratePreRowSaveEvent; -use Drupal\migrate\Event\MigrateEvents; use Drupal\migrate\MigrateSkipRowException; use Drupal\migrate\Row; use Drupal\user\UserInterface; diff --git a/docroot/modules/custom/va_gov_vamc/src/EntityAutocompleteMatcher.php b/docroot/modules/custom/va_gov_vamc/src/EntityAutocompleteMatcher.php index aa183e32a2..7a32d5c727 100644 --- a/docroot/modules/custom/va_gov_vamc/src/EntityAutocompleteMatcher.php +++ b/docroot/modules/custom/va_gov_vamc/src/EntityAutocompleteMatcher.php @@ -5,9 +5,9 @@ use Drupal\Component\Utility\Html; use Drupal\Component\Utility\Tags; use Drupal\Core\Entity\EntityAutocompleteMatcherInterface; +use Drupal\Core\Entity\EntityReferenceSelection\SelectionPluginManagerInterface; use Drupal\Core\Entity\EntityRepository; use Drupal\Core\Entity\EntityTypeManager; -use Drupal\Core\Entity\EntityReferenceSelection\SelectionPluginManagerInterface; /** * Matcher class to get autocompletion results for entity reference. diff --git a/docroot/modules/custom/va_gov_vamc/src/EventSubscriber/VAMCEntityEventSubscriber.php b/docroot/modules/custom/va_gov_vamc/src/EventSubscriber/VAMCEntityEventSubscriber.php index 968d481f5d..d9d866d106 100644 --- a/docroot/modules/custom/va_gov_vamc/src/EventSubscriber/VAMCEntityEventSubscriber.php +++ b/docroot/modules/custom/va_gov_vamc/src/EventSubscriber/VAMCEntityEventSubscriber.php @@ -3,16 +3,16 @@ namespace Drupal\va_gov_vamc\EventSubscriber; use Drupal\Component\Render\FormattableMarkup; +use Drupal\Core\Entity\EntityInterface; +use Drupal\Core\Entity\EntityTypeManager; +use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Session\AccountInterface; use Drupal\core_event_dispatcher\EntityHookEvents; use Drupal\core_event_dispatcher\Event\Entity\EntityInsertEvent; use Drupal\core_event_dispatcher\Event\Entity\EntityPresaveEvent; use Drupal\core_event_dispatcher\Event\Entity\EntityUpdateEvent; use Drupal\core_event_dispatcher\Event\Entity\EntityViewAlterEvent; use Drupal\core_event_dispatcher\Event\Form\FormIdAlterEvent; -use Drupal\Core\Entity\EntityInterface; -use Drupal\Core\Entity\EntityTypeManager; -use Drupal\Core\Form\FormStateInterface; -use Drupal\Core\Session\AccountInterface; use Drupal\node\NodeInterface; use Drupal\paragraphs\ParagraphInterface; use Drupal\va_gov_notifications\Service\NotificationsManager; diff --git a/docroot/modules/custom/va_gov_vamc/src/EventSubscriber/VAMCEntityPreventReuse.php b/docroot/modules/custom/va_gov_vamc/src/EventSubscriber/VAMCEntityPreventReuse.php index 7225cc5a29..4e12fe946e 100644 --- a/docroot/modules/custom/va_gov_vamc/src/EventSubscriber/VAMCEntityPreventReuse.php +++ b/docroot/modules/custom/va_gov_vamc/src/EventSubscriber/VAMCEntityPreventReuse.php @@ -2,14 +2,14 @@ namespace Drupal\va_gov_vamc\EventSubscriber; -use Drupal\core_event_dispatcher\EntityHookEvents; -use Drupal\core_event_dispatcher\Event\Entity\EntityAccessEvent; -use Drupal\core_event_dispatcher\Event\Entity\EntityViewEvent; use Drupal\Core\Access\AccessResult; use Drupal\Core\Database\Connection; use Drupal\Core\Messenger\MessengerInterface; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\StringTranslation\StringTranslationTrait; +use Drupal\core_event_dispatcher\EntityHookEvents; +use Drupal\core_event_dispatcher\Event\Entity\EntityAccessEvent; +use Drupal\core_event_dispatcher\Event\Entity\EntityViewEvent; use Drupal\node\NodeInterface; use Drupal\va_gov_facilities\FacilityOps; use Drupal\va_gov_user\Service\UserPermsService; diff --git a/docroot/modules/custom/va_gov_vamc/va_gov_vamc.install b/docroot/modules/custom/va_gov_vamc/va_gov_vamc.install index 847284157f..05ef02c07c 100644 --- a/docroot/modules/custom/va_gov_vamc/va_gov_vamc.install +++ b/docroot/modules/custom/va_gov_vamc/va_gov_vamc.install @@ -5,9 +5,9 @@ * Install file for VA Gov VAMC. */ -use Drupal\field\Entity\FieldConfig; -use Drupal\Core\Utility\UpdateException; use Drupal\Component\Render\FormattableMarkup; +use Drupal\Core\Utility\UpdateException; +use Drupal\field\Entity\FieldConfig; use Drupal\menu_link_content\Entity\MenuLinkContent; use Drupal\node\Entity\Node; use Psr\Log\LogLevel; diff --git a/docroot/modules/custom/va_gov_vet_center/src/Plugin/QueueWorker/RequiredServiceBase.php b/docroot/modules/custom/va_gov_vet_center/src/Plugin/QueueWorker/RequiredServiceBase.php index 8af2dac6e1..281c553a52 100644 --- a/docroot/modules/custom/va_gov_vet_center/src/Plugin/QueueWorker/RequiredServiceBase.php +++ b/docroot/modules/custom/va_gov_vet_center/src/Plugin/QueueWorker/RequiredServiceBase.php @@ -5,8 +5,8 @@ use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\Queue\QueueWorkerBase; -use Symfony\Component\DependencyInjection\ContainerInterface; use Drupal\node\Entity\Node; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * Provides base functionality for the Subscription Builder Queue Workers. diff --git a/docroot/modules/custom/va_gov_vet_center/va_gov_vet_center.module b/docroot/modules/custom/va_gov_vet_center/va_gov_vet_center.module index a46ed09908..b491667a0d 100644 --- a/docroot/modules/custom/va_gov_vet_center/va_gov_vet_center.module +++ b/docroot/modules/custom/va_gov_vet_center/va_gov_vet_center.module @@ -5,10 +5,10 @@ * Contains va_gov_vet_center.module. */ -use Drupal\views\Views; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\views\Views; /** * Implements hook_help(). diff --git a/docroot/modules/custom/va_gov_workflow/va_gov_workflow.module b/docroot/modules/custom/va_gov_workflow/va_gov_workflow.module index 4e940c0bea..3a8187103a 100644 --- a/docroot/modules/custom/va_gov_workflow/va_gov_workflow.module +++ b/docroot/modules/custom/va_gov_workflow/va_gov_workflow.module @@ -5,9 +5,9 @@ * Contains va_gov_workflow.module. */ +use Drupal\Core\Entity\ContentEntityTypeInterface; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\RouteMatchInterface; -use Drupal\Core\Entity\ContentEntityTypeInterface; /** * Implements hook_help(). diff --git a/docroot/modules/custom/va_gov_workflow_assignments/src/Service/SectionHierarchyBreadcrumb.php b/docroot/modules/custom/va_gov_workflow_assignments/src/Service/SectionHierarchyBreadcrumb.php index b7337beeaa..ad8c343b2a 100644 --- a/docroot/modules/custom/va_gov_workflow_assignments/src/Service/SectionHierarchyBreadcrumb.php +++ b/docroot/modules/custom/va_gov_workflow_assignments/src/Service/SectionHierarchyBreadcrumb.php @@ -3,10 +3,10 @@ namespace Drupal\va_gov_workflow_assignments\Service; use Drupal\Core\Entity\EntityTypeManagerInterface; -use Drupal\Core\Utility\LinkGeneratorInterface; use Drupal\Core\Link; use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\Core\StringTranslation\TranslationInterface; +use Drupal\Core\Utility\LinkGeneratorInterface; use Drupal\node\NodeInterface; use Drupal\taxonomy\TermInterface; diff --git a/docroot/phpcs.baseline.xml b/docroot/phpcs.baseline.xml new file mode 100644 index 0000000000..31a983cb72 --- /dev/null +++ b/docroot/phpcs.baseline.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docroot/themes/custom/vagovclaro/vagovclaro.theme b/docroot/themes/custom/vagovclaro/vagovclaro.theme index b4b8c37ce4..3612b5a486 100644 --- a/docroot/themes/custom/vagovclaro/vagovclaro.theme +++ b/docroot/themes/custom/vagovclaro/vagovclaro.theme @@ -6,9 +6,9 @@ */ use Drupal\block\Entity\Block; -use Drupal\Core\Url; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Render\Element; +use Drupal\Core\Url; use Drupal\node\Entity\Node; use Drupal\node\NodeInterface; diff --git a/tests/phpunit/Content/PreventAbsoluteCmsLinksValidatorTest.php b/tests/phpunit/Content/PreventAbsoluteCmsLinksValidatorTest.php index f27f13ce9f..a21cdcca58 100644 --- a/tests/phpunit/Content/PreventAbsoluteCmsLinksValidatorTest.php +++ b/tests/phpunit/Content/PreventAbsoluteCmsLinksValidatorTest.php @@ -4,8 +4,8 @@ use Drupal\va_gov_backend\Plugin\Validation\Constraint\PreventAbsoluteCmsLinks; use Drupal\va_gov_backend\Plugin\Validation\Constraint\PreventAbsoluteCmsLinksValidator; -use Tests\Support\Traits\ValidatorTestTrait; use Tests\Support\Classes\VaGovUnitTestBase; +use Tests\Support\Traits\ValidatorTestTrait; /** * A test to confirm the proper functioning of this validator. diff --git a/tests/phpunit/Content/PreventLocalFileLinksValidatorTest.php b/tests/phpunit/Content/PreventLocalFileLinksValidatorTest.php index ac882584d6..c8d5f10127 100644 --- a/tests/phpunit/Content/PreventLocalFileLinksValidatorTest.php +++ b/tests/phpunit/Content/PreventLocalFileLinksValidatorTest.php @@ -4,8 +4,8 @@ use Drupal\va_gov_backend\Plugin\Validation\Constraint\PreventLocalFileLinks; use Drupal\va_gov_backend\Plugin\Validation\Constraint\PreventLocalFileLinksValidator; -use Tests\Support\Traits\ValidatorTestTrait; use Tests\Support\Classes\VaGovUnitTestBase; +use Tests\Support\Traits\ValidatorTestTrait; /** * A test to confirm the proper functioning of this validator. diff --git a/tests/phpunit/FrontendBuild/BuildMetricsTest.php b/tests/phpunit/FrontendBuild/BuildMetricsTest.php index bbabd69d2a..1e6a0228b5 100644 --- a/tests/phpunit/FrontendBuild/BuildMetricsTest.php +++ b/tests/phpunit/FrontendBuild/BuildMetricsTest.php @@ -11,8 +11,8 @@ use Drupal\va_gov_build_trigger\Plugin\MetricsCollector\ContentReleaseIntervalRollingAverage; use Drupal\va_gov_build_trigger\Plugin\MetricsCollector\TimeSinceLastContentRelease; use Drupal\va_gov_build_trigger\Service\ReleaseStateManager; -use Tests\Support\Mock\SpecifiedTime; use Tests\Support\Classes\VaGovUnitTestBase; +use Tests\Support\Mock\SpecifiedTime; /** * Unit test for build metrics. diff --git a/tests/phpunit/FrontendBuild/ReleaseStateManagerTest.php b/tests/phpunit/FrontendBuild/ReleaseStateManagerTest.php index 3ac021fd35..02ec46c49f 100644 --- a/tests/phpunit/FrontendBuild/ReleaseStateManagerTest.php +++ b/tests/phpunit/FrontendBuild/ReleaseStateManagerTest.php @@ -7,9 +7,9 @@ use Drupal\Core\State\State; use Drupal\va_gov_build_trigger\Event\ReleaseStateTransitionEvent; use Drupal\va_gov_build_trigger\Service\ReleaseStateManager; -use Tests\Support\Mock\SpecifiedTime; use Symfony\Component\EventDispatcher\EventDispatcher; use Tests\Support\Classes\VaGovUnitTestBase; +use Tests\Support\Mock\SpecifiedTime; /** * Unit test for the release state manager. diff --git a/tests/phpunit/Migration/VaFacilityNcaMigrationTest.php b/tests/phpunit/Migration/VaFacilityNcaMigrationTest.php index 4b80b5a699..50371f1262 100644 --- a/tests/phpunit/Migration/VaFacilityNcaMigrationTest.php +++ b/tests/phpunit/Migration/VaFacilityNcaMigrationTest.php @@ -2,10 +2,10 @@ namespace tests\phpunit\Migration; +use Tests\Support\Classes\VaGovExistingSiteBase; use Tests\Support\Entity\Storage as EntityStorage; use Tests\Support\Migration\Migrator; use Tests\Support\Mock\HttpClient as MockHttpClient; -use Tests\Support\Classes\VaGovExistingSiteBase; /** * A test to confirm that the VA HC Facility Migration works correctly. diff --git a/tests/phpunit/Migration/VaFormMigrationTest.php b/tests/phpunit/Migration/VaFormMigrationTest.php index 7b6fd37169..1762a3fe78 100644 --- a/tests/phpunit/Migration/VaFormMigrationTest.php +++ b/tests/phpunit/Migration/VaFormMigrationTest.php @@ -2,10 +2,10 @@ namespace tests\phpunit\Migration; +use Tests\Support\Classes\VaGovExistingSiteBase; use Tests\Support\Entity\Storage as EntityStorage; use Tests\Support\Migration\Migrator; use Tests\Support\Mock\HttpClient as MockHttpClient; -use Tests\Support\Classes\VaGovExistingSiteBase; /** * A test to confirm that the VA Form Migration works correctly. diff --git a/tests/phpunit/Migration/VaHealthCareLocalFacilityMigrationTest.php b/tests/phpunit/Migration/VaHealthCareLocalFacilityMigrationTest.php index bf90ba5f39..a951a4e98c 100644 --- a/tests/phpunit/Migration/VaHealthCareLocalFacilityMigrationTest.php +++ b/tests/phpunit/Migration/VaHealthCareLocalFacilityMigrationTest.php @@ -2,10 +2,10 @@ namespace tests\phpunit\Migration; +use Tests\Support\Classes\VaGovExistingSiteBase; use Tests\Support\Entity\Storage as EntityStorage; use Tests\Support\Migration\Migrator; use Tests\Support\Mock\HttpClient as MockHttpClient; -use Tests\Support\Classes\VaGovExistingSiteBase; /** * A test to confirm that the VA HC Facility Migration works correctly. diff --git a/tests/phpunit/Ops/DatadogTest.php b/tests/phpunit/Ops/DatadogTest.php index 7063294d10..764488d78e 100644 --- a/tests/phpunit/Ops/DatadogTest.php +++ b/tests/phpunit/Ops/DatadogTest.php @@ -2,11 +2,11 @@ namespace tests\phpunit\Ops; -use PNX\Prometheus\Gauge; use Drupal\Core\Site\Settings; use Drupal\va_gov_backend\Service\Datadog; -use Tests\Support\Mock\HttpClient; +use PNX\Prometheus\Gauge; use Tests\Support\Classes\VaGovExistingSiteBase; +use Tests\Support\Mock\HttpClient; /** * Test the Datadog service. diff --git a/tests/phpunit/Support/Classes/VaGovBrowserTestBase.php b/tests/phpunit/Support/Classes/VaGovBrowserTestBase.php index 6db38c140a..1e15cfe682 100644 --- a/tests/phpunit/Support/Classes/VaGovBrowserTestBase.php +++ b/tests/phpunit/Support/Classes/VaGovBrowserTestBase.php @@ -2,8 +2,8 @@ namespace Tests\Support\Classes; -use Prophecy\PhpUnit\ProphecyTrait; use Drupal\Tests\BrowserTestBase; +use Prophecy\PhpUnit\ProphecyTrait; /** * Common functionality for BrowserTestBase derivative test classes. diff --git a/tests/phpunit/Support/Classes/VaGovUnitTestBase.php b/tests/phpunit/Support/Classes/VaGovUnitTestBase.php index 240a23cd91..e44ac406b6 100644 --- a/tests/phpunit/Support/Classes/VaGovUnitTestBase.php +++ b/tests/phpunit/Support/Classes/VaGovUnitTestBase.php @@ -2,8 +2,8 @@ namespace Tests\Support\Classes; -use Prophecy\PhpUnit\ProphecyTrait; use Drupal\Tests\UnitTestCase; +use Prophecy\PhpUnit\ProphecyTrait; /** * Common functionality for UnitTestCase derivative test classes. diff --git a/tests/phpunit/Support/Traits/ValidatorTestTrait.php b/tests/phpunit/Support/Traits/ValidatorTestTrait.php index 409731afc9..b40ffebcaa 100644 --- a/tests/phpunit/Support/Traits/ValidatorTestTrait.php +++ b/tests/phpunit/Support/Traits/ValidatorTestTrait.php @@ -5,9 +5,9 @@ use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Field\FieldItemInterface; use Prophecy\Argument; +use Symfony\Component\Validator\ConstraintValidatorInterface; use Symfony\Component\Validator\Context\ExecutionContextInterface; use Symfony\Component\Validator\Violation\ConstraintViolationBuilderInterface; -use Symfony\Component\Validator\ConstraintValidatorInterface; /** * Useful methods for testing constraint validation. diff --git a/tests/phpunit/va_gov_content_release/functional/EventSubscriber/FormRouteSubscriberTest.php b/tests/phpunit/va_gov_content_release/functional/EventSubscriber/FormRouteSubscriberTest.php index 4b624603c1..e56b634489 100644 --- a/tests/phpunit/va_gov_content_release/functional/EventSubscriber/FormRouteSubscriberTest.php +++ b/tests/phpunit/va_gov_content_release/functional/EventSubscriber/FormRouteSubscriberTest.php @@ -3,10 +3,10 @@ namespace tests\phpunit\va_gov_content_release\functional\EventSubscriber; use Drupal\va_gov_content_release\EventSubscriber\FormRouteSubscriber; -use Tests\Support\Classes\VaGovExistingSiteBase; use Drupal\va_gov_content_release\Form\BaseForm; use Drupal\va_gov_content_release\Form\GitForm; use Drupal\va_gov_content_release\Form\SimpleForm; +use Tests\Support\Classes\VaGovExistingSiteBase; /** * Functional test of the Form Route Subscriber service. diff --git a/tests/phpunit/va_gov_content_release/unit/EntityEvent/Strategy/Resolver/ResolverTest.php b/tests/phpunit/va_gov_content_release/unit/EntityEvent/Strategy/Resolver/ResolverTest.php index 9f0d321521..1e102b1962 100644 --- a/tests/phpunit/va_gov_content_release/unit/EntityEvent/Strategy/Resolver/ResolverTest.php +++ b/tests/phpunit/va_gov_content_release/unit/EntityEvent/Strategy/Resolver/ResolverTest.php @@ -4,8 +4,8 @@ use Drupal\va_gov_content_release\EntityEvent\Strategy\Resolver\Resolver; use Drupal\va_gov_content_release\EntityEvent\Strategy\Resolver\ResolverInterface; -use Drupal\va_gov_environment\Environment\Environment; use Drupal\va_gov_environment\Discovery\DiscoveryInterface; +use Drupal\va_gov_environment\Environment\Environment; use Tests\Support\Classes\VaGovUnitTestBase; /** diff --git a/tests/phpunit/va_gov_content_release/unit/EventSubscriber/EntityEventSubscriberTest.php b/tests/phpunit/va_gov_content_release/unit/EventSubscriber/EntityEventSubscriberTest.php index 88724d9170..503cf5d476 100644 --- a/tests/phpunit/va_gov_content_release/unit/EventSubscriber/EntityEventSubscriberTest.php +++ b/tests/phpunit/va_gov_content_release/unit/EventSubscriber/EntityEventSubscriberTest.php @@ -2,16 +2,16 @@ namespace tests\phpunit\va_gov_content_release\unit\EventSubscriber; +use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Link; use Drupal\core_event_dispatcher\EntityHookEvents; use Drupal\core_event_dispatcher\Event\Entity\AbstractEntityEvent; -use Drupal\Core\Entity\EntityInterface; use Drupal\user\UserInterface; -use Drupal\va_gov_content_release\EntityEvent\Strategy\Plugin\StrategyPluginManagerInterface; use Drupal\va_gov_content_release\EntityEvent\Strategy\Plugin\StrategyPluginInterface; +use Drupal\va_gov_content_release\EntityEvent\Strategy\Plugin\StrategyPluginManagerInterface; use Drupal\va_gov_content_release\EntityEvent\Strategy\Resolver\ResolverInterface; -use Drupal\va_gov_content_release\Request\RequestInterface; use Drupal\va_gov_content_release\EventSubscriber\EntityEventSubscriber; +use Drupal\va_gov_content_release\Request\RequestInterface; use Drupal\va_gov_content_types\Entity\VaNodeInterface; use Prophecy\Argument; use Symfony\Component\DependencyInjection\Container; diff --git a/tests/phpunit/va_gov_content_release/unit/Form/Resolver/ResolverTest.php b/tests/phpunit/va_gov_content_release/unit/Form/Resolver/ResolverTest.php index 07ff156bc7..08620b473f 100644 --- a/tests/phpunit/va_gov_content_release/unit/Form/Resolver/ResolverTest.php +++ b/tests/phpunit/va_gov_content_release/unit/Form/Resolver/ResolverTest.php @@ -2,11 +2,11 @@ namespace tests\phpunit\va_gov_content_release\unit\Form\Resolver; -use Drupal\va_gov_content_release\Form\SimpleForm; use Drupal\va_gov_content_release\Form\GitForm; use Drupal\va_gov_content_release\Form\Resolver\Resolver; -use Drupal\va_gov_environment\Environment\Environment; +use Drupal\va_gov_content_release\Form\SimpleForm; use Drupal\va_gov_environment\Discovery\DiscoveryInterface; +use Drupal\va_gov_environment\Environment\Environment; use Tests\Support\Classes\VaGovUnitTestBase; /** diff --git a/tests/phpunit/va_gov_content_release/unit/GitHub/GitHubRepositoryDispatchTest.php b/tests/phpunit/va_gov_content_release/unit/GitHub/GitHubRepositoryDispatchTest.php index 3c9e70def7..6934f9ec04 100644 --- a/tests/phpunit/va_gov_content_release/unit/GitHub/GitHubRepositoryDispatchTest.php +++ b/tests/phpunit/va_gov_content_release/unit/GitHub/GitHubRepositoryDispatchTest.php @@ -2,10 +2,10 @@ namespace tests\phpunit\va_gov_content_release\unit\GitHub; -use Drupal\va_gov_github\Api\Client\ApiClientInterface; use Drupal\va_gov_content_release\Exception\ContentReleaseInProgressException; use Drupal\va_gov_content_release\Exception\GitHubRepositoryDispatchException; use Drupal\va_gov_content_release\GitHub\GitHubRepositoryDispatch; +use Drupal\va_gov_github\Api\Client\ApiClientInterface; use Prophecy\Argument; use Tests\Support\Classes\VaGovUnitTestBase; diff --git a/tests/phpunit/va_gov_content_release/unit/LocalFilesystem/LocalFilesystemBuildFileTest.php b/tests/phpunit/va_gov_content_release/unit/LocalFilesystem/LocalFilesystemBuildFileTest.php index 9c63a929f4..8780f91385 100644 --- a/tests/phpunit/va_gov_content_release/unit/LocalFilesystem/LocalFilesystemBuildFileTest.php +++ b/tests/phpunit/va_gov_content_release/unit/LocalFilesystem/LocalFilesystemBuildFileTest.php @@ -2,11 +2,11 @@ namespace tests\phpunit\va_gov_content_release\unit\LocalFilesystem; -use Drupal\va_gov_content_release\LocalFilesystem\LocalFilesystemBuildFile; -use Tests\Support\Classes\VaGovUnitTestBase; -use Drupal\Core\File\FileSystemInterface; use Drupal\Core\File\Exception\FileException; +use Drupal\Core\File\FileSystemInterface; use Drupal\va_gov_content_release\Exception\StrategyErrorException; +use Drupal\va_gov_content_release\LocalFilesystem\LocalFilesystemBuildFile; +use Tests\Support\Classes\VaGovUnitTestBase; /** * Unit test of the LocalFilesystemBuildFile service. diff --git a/tests/phpunit/va_gov_content_release/unit/Plugin/EntityEventStrategy/OnDemandTest.php b/tests/phpunit/va_gov_content_release/unit/Plugin/EntityEventStrategy/OnDemandTest.php index 82ac650331..421c88a7c6 100644 --- a/tests/phpunit/va_gov_content_release/unit/Plugin/EntityEventStrategy/OnDemandTest.php +++ b/tests/phpunit/va_gov_content_release/unit/Plugin/EntityEventStrategy/OnDemandTest.php @@ -3,9 +3,9 @@ namespace tests\phpunit\va_gov_content_release\unit\Plugin\EntityEventStrategy; use Drupal\Core\Link; -use Drupal\va_gov_content_types\Entity\VaNodeInterface; -use Drupal\va_gov_content_release\Plugin\EntityEventStrategy\OnDemand; use Drupal\Core\Logger\LoggerChannelFactoryInterface; +use Drupal\va_gov_content_release\Plugin\EntityEventStrategy\OnDemand; +use Drupal\va_gov_content_types\Entity\VaNodeInterface; use Prophecy\Argument; use Psr\Log\LoggerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; diff --git a/tests/phpunit/va_gov_content_release/unit/Plugin/EntityEventStrategy/VerboseFalseTest.php b/tests/phpunit/va_gov_content_release/unit/Plugin/EntityEventStrategy/VerboseFalseTest.php index 8a0efe69a9..7b7523824f 100644 --- a/tests/phpunit/va_gov_content_release/unit/Plugin/EntityEventStrategy/VerboseFalseTest.php +++ b/tests/phpunit/va_gov_content_release/unit/Plugin/EntityEventStrategy/VerboseFalseTest.php @@ -3,14 +3,14 @@ namespace tests\phpunit\va_gov_content_release\unit\Plugin\EntityEventStrategy; use Drupal\Core\Link; -use Drupal\va_gov_content_types\Entity\VaNodeInterface; -use Drupal\va_gov_content_release\Plugin\EntityEventStrategy\VerboseFalse; use Drupal\Core\Logger\LoggerChannelFactoryInterface; +use Drupal\Tests\Traits\Core\GeneratePermutationsTrait; +use Drupal\va_gov_content_release\Plugin\EntityEventStrategy\VerboseFalse; +use Drupal\va_gov_content_types\Entity\VaNodeInterface; use Prophecy\Argument; use Psr\Log\LoggerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; use Tests\Support\Classes\VaGovUnitTestBase; -use Drupal\Tests\Traits\Core\GeneratePermutationsTrait; /** * Unit test of the Verbose FALSE entity event strategy plugin. diff --git a/tests/phpunit/va_gov_content_release/unit/Plugin/Strategy/GitHubRepositoryDispatchTest.php b/tests/phpunit/va_gov_content_release/unit/Plugin/Strategy/GitHubRepositoryDispatchTest.php index c254671d12..d17df70523 100644 --- a/tests/phpunit/va_gov_content_release/unit/Plugin/Strategy/GitHubRepositoryDispatchTest.php +++ b/tests/phpunit/va_gov_content_release/unit/Plugin/Strategy/GitHubRepositoryDispatchTest.php @@ -7,8 +7,8 @@ use Drupal\va_gov_content_release\Exception\GitHubRepositoryDispatchException; use Drupal\va_gov_content_release\Exception\StrategyErrorException; use Drupal\va_gov_content_release\GitHub\GitHubRepositoryDispatchInterface; -use Drupal\va_gov_content_release\Reporter\ReporterInterface; use Drupal\va_gov_content_release\Plugin\Strategy\GitHubRepositoryDispatch; +use Drupal\va_gov_content_release\Reporter\ReporterInterface; use Prophecy\Argument; use Symfony\Component\DependencyInjection\ContainerInterface; use Tests\Support\Classes\VaGovUnitTestBase; diff --git a/tests/phpunit/va_gov_content_release/unit/Plugin/Strategy/LocalFilesystemBuildFileTest.php b/tests/phpunit/va_gov_content_release/unit/Plugin/Strategy/LocalFilesystemBuildFileTest.php index 9aabdb8447..98299e4ce8 100644 --- a/tests/phpunit/va_gov_content_release/unit/Plugin/Strategy/LocalFilesystemBuildFileTest.php +++ b/tests/phpunit/va_gov_content_release/unit/Plugin/Strategy/LocalFilesystemBuildFileTest.php @@ -6,8 +6,8 @@ use Drupal\Core\StringTranslation\TranslationInterface; use Drupal\va_gov_content_release\Exception\StrategyErrorException; use Drupal\va_gov_content_release\LocalFilesystem\LocalFilesystemBuildFileInterface; -use Drupal\va_gov_content_release\Reporter\ReporterInterface; use Drupal\va_gov_content_release\Plugin\Strategy\LocalFilesystemBuildFile; +use Drupal\va_gov_content_release\Reporter\ReporterInterface; use Prophecy\Argument; use Symfony\Component\DependencyInjection\ContainerInterface; use Tests\Support\Classes\VaGovUnitTestBase; diff --git a/tests/phpunit/va_gov_content_release/unit/Reporter/ReporterTest.php b/tests/phpunit/va_gov_content_release/unit/Reporter/ReporterTest.php index 86652d8c11..179e45125c 100644 --- a/tests/phpunit/va_gov_content_release/unit/Reporter/ReporterTest.php +++ b/tests/phpunit/va_gov_content_release/unit/Reporter/ReporterTest.php @@ -2,9 +2,9 @@ namespace tests\phpunit\va_gov_content_release\unit\Reporter; -use Drupal\Core\StringTranslation\TranslationInterface; use Drupal\Core\Logger\LoggerChannelFactoryInterface; use Drupal\Core\Messenger\MessengerInterface; +use Drupal\Core\StringTranslation\TranslationInterface; use Drupal\va_gov_content_release\Reporter\Reporter; use Prophecy\Argument; use Psr\Log\LoggerInterface; diff --git a/tests/phpunit/va_gov_content_release/unit/Request/RequestTest.php b/tests/phpunit/va_gov_content_release/unit/Request/RequestTest.php index 2466b5ad73..869693b4dc 100644 --- a/tests/phpunit/va_gov_content_release/unit/Request/RequestTest.php +++ b/tests/phpunit/va_gov_content_release/unit/Request/RequestTest.php @@ -2,10 +2,10 @@ namespace tests\phpunit\va_gov_content_release\unit\Request; -use Drupal\Core\Entity\EntityTypeManagerInterface; -use Drupal\Core\Entity\EntityStorageInterface; use Drupal\advancedqueue\Entity\QueueInterface; use Drupal\advancedqueue\Job; +use Drupal\Core\Entity\EntityStorageInterface; +use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\va_gov_content_release\Exception\RequestException; use Drupal\va_gov_content_release\Request\Request; use Drupal\va_gov_content_release\Request\RequestInterface; diff --git a/tests/phpunit/va_gov_content_release/unit/Strategy/Resolver/ResolverTest.php b/tests/phpunit/va_gov_content_release/unit/Strategy/Resolver/ResolverTest.php index 92df55c124..68e8b36179 100644 --- a/tests/phpunit/va_gov_content_release/unit/Strategy/Resolver/ResolverTest.php +++ b/tests/phpunit/va_gov_content_release/unit/Strategy/Resolver/ResolverTest.php @@ -4,8 +4,8 @@ use Drupal\va_gov_content_release\Strategy\Resolver\Resolver; use Drupal\va_gov_content_release\Strategy\Resolver\ResolverInterface; -use Drupal\va_gov_environment\Environment\Environment; use Drupal\va_gov_environment\Discovery\DiscoveryInterface; +use Drupal\va_gov_environment\Environment\Environment; use Tests\Support\Classes\VaGovUnitTestBase; /** diff --git a/tests/phpunit/va_gov_environment/unit/Discovery/DiscoveryTest.php b/tests/phpunit/va_gov_environment/unit/Discovery/DiscoveryTest.php index 5dc7e76510..8b1c834e75 100644 --- a/tests/phpunit/va_gov_environment/unit/Discovery/DiscoveryTest.php +++ b/tests/phpunit/va_gov_environment/unit/Discovery/DiscoveryTest.php @@ -3,8 +3,8 @@ namespace tests\phpunit\va_gov_environment\unit\Discovery; use Drupal\Core\Site\Settings; -use Drupal\va_gov_environment\Environment\Environment; use Drupal\va_gov_environment\Discovery\Discovery; +use Drupal\va_gov_environment\Environment\Environment; use Drupal\va_gov_environment\Exception\InvalidEnvironmentException; use Tests\Support\Classes\VaGovUnitTestBase; diff --git a/tests/phpunit/va_gov_github/unit/Api/Client/ApiClientTest.php b/tests/phpunit/va_gov_github/unit/Api/Client/ApiClientTest.php index f0dd353402..b18612dd77 100644 --- a/tests/phpunit/va_gov_github/unit/Api/Client/ApiClientTest.php +++ b/tests/phpunit/va_gov_github/unit/Api/Client/ApiClientTest.php @@ -3,15 +3,15 @@ namespace Tests\va_gov_github\unit\Api\Client; use Drupal\va_gov_github\Api\Client\ApiClient; -use Tests\Support\Traits\RawGitHubApiClientTrait; -use Tests\Support\Classes\VaGovUnitTestBase; -use Github\AuthMethod; use Github\Api\Repo; -use Github\Api\Search; use Github\Api\Repository\Actions\WorkflowRuns; use Github\Api\Repository\Actions\Workflows; +use Github\Api\Search; +use Github\AuthMethod; use Github\Client as RawApiClient; use Prophecy\Argument; +use Tests\Support\Classes\VaGovUnitTestBase; +use Tests\Support\Traits\RawGitHubApiClientTrait; /** * Unit test of the API Client class. diff --git a/tests/phpunit/va_gov_github/unit/Api/Client/RawApiClientTest.php b/tests/phpunit/va_gov_github/unit/Api/Client/RawApiClientTest.php index 2409eb76ac..90e0f01f6d 100644 --- a/tests/phpunit/va_gov_github/unit/Api/Client/RawApiClientTest.php +++ b/tests/phpunit/va_gov_github/unit/Api/Client/RawApiClientTest.php @@ -2,9 +2,9 @@ namespace Tests\va_gov_github\unit\Api\Client; -use Tests\Support\Traits\RawGitHubApiClientTrait; -use Tests\Support\Classes\VaGovUnitTestBase; use Github\AuthMethod; +use Tests\Support\Classes\VaGovUnitTestBase; +use Tests\Support\Traits\RawGitHubApiClientTrait; /** * Unit test of the API Client class. diff --git a/tests/phpunit/va_gov_github/unit/Api/Settings/ApiSettingsTest.php b/tests/phpunit/va_gov_github/unit/Api/Settings/ApiSettingsTest.php index ecf7f5789c..2fd5705f76 100644 --- a/tests/phpunit/va_gov_github/unit/Api/Settings/ApiSettingsTest.php +++ b/tests/phpunit/va_gov_github/unit/Api/Settings/ApiSettingsTest.php @@ -3,8 +3,8 @@ namespace Tests\va_gov_github\unit\Api\Settings; use Drupal\Core\Site\Settings; -use Tests\Support\Classes\VaGovUnitTestBase; use Drupal\va_gov_github\Api\Settings\ApiSettings; +use Tests\Support\Classes\VaGovUnitTestBase; /** * Unit test of the API Settings class.