From 841bf9f5d857822fbf68a7b87d98fa772693bdd7 Mon Sep 17 00:00:00 2001
From: Shishir <75600200+shishir-intelli@users.noreply.github.com>
Date: Tue, 24 Sep 2024 12:48:11 +0530
Subject: [PATCH] PHPCS fix - Use statement sorted alphabetically (#705)

---
 .../src/EventSubscriber/ConfigEventsSubscriber.php        | 2 +-
 .../src/Form/CustomizerForm.php                           | 2 +-
 .../src/ApigeeKickStartEnhancer.php                       | 2 +-
 .../src/Plugin/Condition/BlockType.php                    | 4 ++--
 .../src/Routing/RouteSubscriber.php                       | 2 +-
 src/Installer/ApigeeDevportalKickstartTasksManager.php    | 2 +-
 src/Installer/Form/ApigeeEdgeConfigurationForm.php        | 2 +-
 .../Form/ApigeeMonetizationConfigurationForm.php          | 8 ++++----
 themes/custom/apigee_kickstart/includes/form.inc          | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/custom/apigee_kickstart_customizer/src/EventSubscriber/ConfigEventsSubscriber.php b/modules/custom/apigee_kickstart_customizer/src/EventSubscriber/ConfigEventsSubscriber.php
index 0493dd56..46ad5caf 100644
--- a/modules/custom/apigee_kickstart_customizer/src/EventSubscriber/ConfigEventsSubscriber.php
+++ b/modules/custom/apigee_kickstart_customizer/src/EventSubscriber/ConfigEventsSubscriber.php
@@ -20,9 +20,9 @@
 
 namespace Drupal\apigee_kickstart_customizer\EventSubscriber;
 
-use Drupal\apigee_kickstart_customizer\CustomizerInterface;
 use Drupal\Core\Config\ConfigCrudEvent;
 use Drupal\Core\Config\ConfigEvents;
+use Drupal\apigee_kickstart_customizer\CustomizerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
diff --git a/modules/custom/apigee_kickstart_customizer/src/Form/CustomizerForm.php b/modules/custom/apigee_kickstart_customizer/src/Form/CustomizerForm.php
index ac3c45c6..f1898060 100644
--- a/modules/custom/apigee_kickstart_customizer/src/Form/CustomizerForm.php
+++ b/modules/custom/apigee_kickstart_customizer/src/Form/CustomizerForm.php
@@ -20,7 +20,6 @@
 
 namespace Drupal\apigee_kickstart_customizer\Form;
 
-use Drupal\apigee_kickstart_customizer\CustomizerInterface;
 use Drupal\Core\Ajax\AjaxFormHelperTrait;
 use Drupal\Core\Ajax\AjaxResponse;
 use Drupal\Core\Ajax\RedirectCommand;
@@ -29,6 +28,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Routing\RedirectDestinationInterface;
 use Drupal\Core\Url;
+use Drupal\apigee_kickstart_customizer\CustomizerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
diff --git a/modules/custom/apigee_kickstart_enhancement/src/ApigeeKickStartEnhancer.php b/modules/custom/apigee_kickstart_enhancement/src/ApigeeKickStartEnhancer.php
index bd541283..8cb66da5 100644
--- a/modules/custom/apigee_kickstart_enhancement/src/ApigeeKickStartEnhancer.php
+++ b/modules/custom/apigee_kickstart_enhancement/src/ApigeeKickStartEnhancer.php
@@ -20,9 +20,9 @@
 
 namespace Drupal\apigee_kickstart_enhancement;
 
-use Drupal\apigee_edge\Entity\AppInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\apigee_edge\Entity\AppInterface;
 
 /**
  * Defines the 'apigee_kickstart.enhancer` service.
diff --git a/modules/custom/apigee_kickstart_enhancement/src/Plugin/Condition/BlockType.php b/modules/custom/apigee_kickstart_enhancement/src/Plugin/Condition/BlockType.php
index bee92794..c82a16b8 100644
--- a/modules/custom/apigee_kickstart_enhancement/src/Plugin/Condition/BlockType.php
+++ b/modules/custom/apigee_kickstart_enhancement/src/Plugin/Condition/BlockType.php
@@ -20,13 +20,13 @@
 
 namespace Drupal\apigee_kickstart_enhancement\Plugin\Condition;
 
-use Drupal\block\BlockInterface;
-use Drupal\block_content\BlockContentUuidLookup;
 use Drupal\Core\Condition\ConditionPluginBase;
 use Drupal\Core\Entity\EntityFormInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\block\BlockInterface;
+use Drupal\block_content\BlockContentUuidLookup;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
diff --git a/modules/custom/apigee_kickstart_enhancement/src/Routing/RouteSubscriber.php b/modules/custom/apigee_kickstart_enhancement/src/Routing/RouteSubscriber.php
index c6d871d4..94bd4213 100644
--- a/modules/custom/apigee_kickstart_enhancement/src/Routing/RouteSubscriber.php
+++ b/modules/custom/apigee_kickstart_enhancement/src/Routing/RouteSubscriber.php
@@ -20,10 +20,10 @@
 
 namespace Drupal\apigee_kickstart_enhancement\Routing;
 
+use Drupal\Core\Routing\RouteSubscriberBase;
 use Drupal\apigee_edge\Entity\ListBuilder\DeveloperAppListBuilderForDeveloper;
 use Drupal\apigee_edge_teams\Entity\ListBuilder\TeamAppListByTeam;
 use Drupal\apigee_kickstart_enhancement\ApigeeKickStartEnhancerInterface;
-use Drupal\Core\Routing\RouteSubscriberBase;
 use Symfony\Component\Routing\RouteCollection;
 
 /**
diff --git a/src/Installer/ApigeeDevportalKickstartTasksManager.php b/src/Installer/ApigeeDevportalKickstartTasksManager.php
index 3e94693c..cc5912d5 100644
--- a/src/Installer/ApigeeDevportalKickstartTasksManager.php
+++ b/src/Installer/ApigeeDevportalKickstartTasksManager.php
@@ -20,9 +20,9 @@
 
 namespace Drupal\apigee_devportal_kickstart\Installer;
 
+use Drupal\Core\Form\FormState;
 use Drupal\apigee_m10n_add_credit\AddCreditConfig;
 use Drupal\commerce_price\Price;
-use Drupal\Core\Form\FormState;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 
 /**
diff --git a/src/Installer/Form/ApigeeEdgeConfigurationForm.php b/src/Installer/Form/ApigeeEdgeConfigurationForm.php
index a7684693..fb7a59cb 100644
--- a/src/Installer/Form/ApigeeEdgeConfigurationForm.php
+++ b/src/Installer/Form/ApigeeEdgeConfigurationForm.php
@@ -20,9 +20,9 @@
 
 namespace Drupal\apigee_devportal_kickstart\Installer\Form;
 
-use Drupal\apigee_edge\Form\AuthenticationForm;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Messenger\MessengerInterface;
+use Drupal\apigee_edge\Form\AuthenticationForm;
 
 /**
  * Configuration form for Apigee Edge.
diff --git a/src/Installer/Form/ApigeeMonetizationConfigurationForm.php b/src/Installer/Form/ApigeeMonetizationConfigurationForm.php
index 08707eb8..e7c6dff4 100755
--- a/src/Installer/Form/ApigeeMonetizationConfigurationForm.php
+++ b/src/Installer/Form/ApigeeMonetizationConfigurationForm.php
@@ -27,13 +27,13 @@
 use CommerceGuys\Addressing\AddressFormat\AddressField;
 use CommerceGuys\Addressing\Subdivision\SubdivisionRepositoryInterface;
 use CommerceGuys\Intl\Currency\CurrencyRepository;
-use Drupal\address\FieldHelper;
-use Drupal\address\LabelHelper;
-use Drupal\apigee_edge\SDKConnectorInterface;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Messenger\MessengerInterface;
+use Drupal\address\FieldHelper;
+use Drupal\address\LabelHelper;
+use Drupal\apigee_edge\SDKConnectorInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -114,7 +114,7 @@ class ApigeeMonetizationConfigurationForm extends FormBase {
    * @param \CommerceGuys\Addressing\Subdivision\SubdivisionRepositoryInterface $subdivision_repository
    *   The subdivision repository.
    */
-  public function __construct(SDKConnectorInterface $sdk_connector, LanguageManagerInterface $language_manager, SubdivisionRepositoryInterface $subdivision_repository = NULL) {
+  public function __construct(SDKConnectorInterface $sdk_connector, LanguageManagerInterface $language_manager, ?SubdivisionRepositoryInterface $subdivision_repository = NULL) {
     $this->sdkConnector = $sdk_connector;
     $this->languageManager = $language_manager;
     $this->subdivisionRepository = $subdivision_repository;
diff --git a/themes/custom/apigee_kickstart/includes/form.inc b/themes/custom/apigee_kickstart/includes/form.inc
index 1a82e610..d44a64ad 100644
--- a/themes/custom/apigee_kickstart/includes/form.inc
+++ b/themes/custom/apigee_kickstart/includes/form.inc
@@ -5,12 +5,12 @@
  * Theme and preprocess functions for forms.
  */
 
-use Drupal\apigee_m10n_add_credit\AddCreditConfig;
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Link;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Core\Url;
+use Drupal\apigee_m10n_add_credit\AddCreditConfig;
 
 /**
  * Implements hook_theme_suggestions_HOOK_alter().