Fixes #3737 SlevomatCodingStandards (#3738)

Co-authored-by: Troy Dean <[email protected]>

modules/custom/az_core/az_core.module

@@ -5,7 +5,6 @@
  * Contains az_core.module.
  */
 
-use Drupal\block\Entity\Block;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Extension\Exception\UnknownExtensionException;
 use Drupal\Core\Form\FormStateInterface;
@@ -14,6 +13,7 @@ use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Url;
+use Drupal\block\Entity\Block;
 use Drupal\pathauto\PathautoPatternInterface;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 

modules/custom/az_core/src/AZConfigOverride.php

@@ -2,15 +2,15 @@
 
 namespace Drupal\az_core;
 
+use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Extension\ModuleExtensionList;
+use Drupal\Core\Extension\ModuleHandler;
 use Drupal\az_core\Plugin\ConfigProvider\QuickstartConfigProvider;
 use Drupal\config_provider\Plugin\ConfigCollector;
 use Drupal\config_snapshot\ConfigSnapshotStorageTrait;
 use Drupal\config_sync\ConfigSyncSnapshotter;
 use Drupal\config_sync\ConfigSyncSnapshotterInterface;
 use Drupal\config_update\ConfigListByProviderInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Extension\ModuleExtensionList;
-use Drupal\Core\Extension\ModuleHandler;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
 

modules/custom/az_core/src/Drush/Commands/AZCoreConfigCommands.php

@@ -2,11 +2,8 @@
 
 namespace Drupal\az_core\Drush\Commands;
 
-use Drupal\az_core\Plugin\ConfigProvider\QuickstartConfigProvider;
 use Drupal\Component\Diff\Diff;
 use Drupal\Component\Serialization\Yaml;
-use Drupal\config_provider\Plugin\ConfigCollector;
-use Drupal\config_update\ConfigDiffer;
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Config\Entity\ConfigDependencyManager;
 use Drupal\Core\Config\FileStorage;
@@ -15,6 +12,9 @@
 use Drupal\Core\Config\StorageInterface;
 use Drupal\Core\Extension\Exception\UnknownExtensionException;
 use Drupal\Core\Extension\ModuleExtensionList;
+use Drupal\az_core\Plugin\ConfigProvider\QuickstartConfigProvider;
+use Drupal\config_provider\Plugin\ConfigCollector;
+use Drupal\config_update\ConfigDiffer;
 use Drupal\user\Entity\Role;
 use Drupal\user\PermissionHandler;
 use Drush\Commands\DrushCommands;

modules/custom/az_core/src/Plugin/ConfigProvider/QuickstartConfigProvider.php

@@ -3,11 +3,11 @@
 namespace Drupal\az_core\Plugin\ConfigProvider;
 
 use Drupal\Component\Diff\Diff;
+use Drupal\Core\Config\InstallStorage;
+use Drupal\Core\Config\StorageInterface;
 use Drupal\config_provider\Plugin\ConfigProviderBase;
 use Drupal\config_snapshot\ConfigSnapshotStorageTrait;
 use Drupal\config_sync\ConfigSyncSnapshotterInterface;
-use Drupal\Core\Config\InstallStorage;
-use Drupal\Core\Config\StorageInterface;
 
 /**
  * Class for providing configuration from a quickstart default directory.

modules/custom/az_core/tests/src/Functional/QuickstartFunctionalTestBase.php

@@ -2,8 +2,8 @@
 
 namespace Drupal\Tests\az_core\Functional;
 
-use Drupal\Tests\az_core\Traits\AllowDrupalLoginSetupTrait;
 use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\az_core\Traits\AllowDrupalLoginSetupTrait;
 
 /**
  * Provides helper methods for Quickstart tests.

modules/custom/az_course/src/Form/CourseImportForm.php

@@ -2,9 +2,9 @@
 
 namespace Drupal\az_course\Form;
 
-use Drupal\az_course\CourseMigrateBatchExecutable;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\az_course\CourseMigrateBatchExecutable;
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\MigrateMessage;
 use Drupal\migrate\Plugin\MigrationInterface;

modules/custom/az_demo/az_demo.module

@@ -5,10 +5,10 @@
  * Contains az_demo.module.
  */
 
-use Drupal\block\Entity\Block;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\block\Entity\Block;
 
 /**
  * Implements hook_help().

modules/custom/az_event/az_event_trellis/az_event_trellis.module

@@ -5,12 +5,12 @@
  * Contains az_event_trellis.module.
  */
 
-use Drupal\az_event_trellis\Plugin\views\filter\AZEventTrellisViewsAttributeFilter;
-use Drupal\az_event_trellis\TrellisHelper;
 use Drupal\Component\Utility\Crypt;
 use Drupal\Core\Entity\EntityFormInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
+use Drupal\az_event_trellis\Plugin\views\filter\AZEventTrellisViewsAttributeFilter;
+use Drupal\az_event_trellis\TrellisHelper;
 
 /**
  * Implements hook_form_FORM_ID_alter() for node_az_event_edit_form.

modules/custom/az_event/az_event_trellis/src/Entity/AZRecurringImportRule.php

@@ -4,8 +4,8 @@
 
 namespace Drupal\az_event_trellis\Entity;
 
-use Drupal\az_event_trellis\AZRecurringImportRuleInterface;
 use Drupal\Core\Config\Entity\ConfigEntityBase;
+use Drupal\az_event_trellis\AZRecurringImportRuleInterface;
 
 /**
  * Defines the recurring import rule entity type.

modules/custom/az_event/az_event_trellis/src/EventSubscriber/AZEventTrellisDataSubscriber.php

@@ -2,10 +2,10 @@
 
 namespace Drupal\az_event_trellis\EventSubscriber;
 
-use Drupal\az_event_trellis\TrellisHelper;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Messenger\Messenger;
 use Drupal\Core\Session\AccountProxy;
+use Drupal\az_event_trellis\TrellisHelper;
 use Drupal\migrate\Event\MigrateEvents;
 use Drupal\migrate\Event\MigratePostRowSaveEvent;
 use Drupal\views\ResultRow;

modules/custom/az_event/az_event_trellis/src/Form/AZRecurringImportRuleForm.php

@@ -4,9 +4,9 @@
 
 namespace Drupal\az_event_trellis\Form;
 
-use Drupal\az_event_trellis\Entity\AZRecurringImportRule;
 use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\az_event_trellis\Entity\AZRecurringImportRule;
 use Drupal\taxonomy\Entity\Term;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 

modules/custom/az_event/az_event_trellis/src/Plugin/migrate/source/AZTrellisEventSource.php

@@ -4,8 +4,8 @@
 
 namespace Drupal\az_event_trellis\Plugin\migrate\source;
 
-use Drupal\migrate\Plugin\migrate\source\SourcePluginBase;
 use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\migrate\Plugin\migrate\source\SourcePluginBase;
 
 /**
  * Source plugin for retrieving data via Trellis events.

modules/custom/az_event/az_event_trellis/src/Plugin/views/field/AZEventTrellisViewsField.php

@@ -46,7 +46,7 @@ public static function create(ContainerInterface $container, array $configuratio
   /**
    * {@inheritdoc}
    */
-  public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
+  public function init(ViewExecutable $view, DisplayPluginBase $display, ?array &$options = NULL) {
     FieldPluginBase::init($view, $display, $options);
     $this->actions = [];
   }

modules/custom/az_event/az_event_trellis/src/TrellisHelper.php

@@ -2,11 +2,11 @@
 
 namespace Drupal\az_event_trellis;
 
-use Drupal\az_event_trellis\Plugin\views\filter\AZEventTrellisViewsAttributeFilter;
 use Drupal\Component\Utility\Crypt;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\az_event_trellis\Plugin\views\filter\AZEventTrellisViewsAttributeFilter;
 use Drupal\views\Views;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\GuzzleException;

modules/custom/az_finder/src/Plugin/better_exposed_filters/filter/AZFinderTaxonomyIndexTidWidget.php

@@ -14,6 +14,9 @@
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\Template\Attribute;
+use Drupal\az_finder\Service\AZFinderIcons;
+use Drupal\better_exposed_filters\BetterExposedFiltersHelper;
+use Drupal\better_exposed_filters\Plugin\better_exposed_filters\filter\FilterWidgetBase;
 use Drupal\taxonomy\Plugin\views\filter\TaxonomyIndexTid;
 use Drupal\views\ViewExecutable;
 use Symfony\Component\DependencyInjection\ContainerInterface;

modules/custom/az_finder/src/Plugin/views/exposed_form/QuickstartExposedFilters.php

@@ -4,7 +4,6 @@
 
 namespace Drupal\az_finder\Plugin\views\exposed_form;
 
-use Drupal\better_exposed_filters\Plugin\views\exposed_form\BetterExposedFilters;
 use Drupal\Core\Form\FormStateInterface;
 
 /**

modules/custom/az_http/src/AZHttpRetryMiddleware.php

@@ -54,7 +54,7 @@ public function __invoke(): callable {
    * @return bool
    *   Whether to retry the request or not.
    */
-  public function decideRetry($retries, RequestInterface $request, ResponseInterface $response = NULL, RequestException $exception = NULL) {
+  public function decideRetry($retries, RequestInterface $request, ?ResponseInterface $response = NULL, ?RequestException $exception = NULL) {
     // Abort if we are beyond our limit.
     if ($retries >= $this->requests) {
       return FALSE;

modules/custom/az_http/src/Strategy/AZPoliteCacheStrategy.php

@@ -27,7 +27,7 @@ class AZPoliteCacheStrategy extends PrivateCacheStrategy {
    * @param int $defaultTtl
    *   A default TTL in absence of actual cache headers.
    */
-  public function __construct(CacheStorageInterface $cache = NULL, $defaultTtl = 600) {
+  public function __construct(?CacheStorageInterface $cache = NULL, $defaultTtl = 600) {
     $this->defaultTtl = $defaultTtl;
     parent::__construct($cache);
   }

modules/custom/az_migration/src/Plugin/migrate/process/MigratedPathLookup.php

@@ -57,7 +57,7 @@ class MigratedPathLookup extends ProcessPluginBase implements ContainerFactoryPl
   /**
    * {@inheritdoc}
    */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration = NULL) {
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, ?MigrationInterface $migration = NULL) {
     $instance = new static(
       $configuration,
       $plugin_id,

modules/custom/az_paragraphs/src/Plugin/migrate/process/ParagraphsBehaviorSettings.php

@@ -143,7 +143,7 @@ public function __construct(array $configuration, $plugin_id, $plugin_definition
   /**
    * {@inheritdoc}
    */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration = NULL) {
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, ?MigrationInterface $migration = NULL) {
     return new static(
       $configuration,
       $plugin_id,

modules/custom/az_paragraphs/tests/src/Unit/AZVideoEmbedHelperTest.php

@@ -2,8 +2,8 @@
 
 namespace Drupal\Tests\az_paragraphs\Unit;
 
-use Drupal\az_paragraphs\AZVideoEmbedHelper;
 use Drupal\Tests\UnitTestCase;
+use Drupal\az_paragraphs\AZVideoEmbedHelper;
 
 /**
  * @coversDefaultClass \Drupal\az_paragraphs\AZVideoEmbedHelper

modules/custom/az_publication/az_publication.module

@@ -5,7 +5,6 @@
  * Contains az_publication.module.
  */
 
-use Drupal\az_publication\Plugin\views\argument\AZCitationStyleArgument;
 use Drupal\Core\Block\BlockPluginInterface;
 use Drupal\Core\Datetime\Element\Datetime;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
@@ -14,6 +13,7 @@ use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Link;
 use Drupal\Core\Url;
+use Drupal\az_publication\Plugin\views\argument\AZCitationStyleArgument;
 use Drupal\filter\Entity\FilterFormat;
 use Drupal\node\Entity\NodeType;
 use Drupal\node\NodeInterface;

modules/custom/az_publication/src/AZAuthorStorage.php

@@ -2,10 +2,10 @@
 
 namespace Drupal\az_publication;
 
-use Drupal\az_publication\Entity\AZAuthorInterface;
 use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\az_publication\Entity\AZAuthorInterface;
 
 /**
  * Defines the storage handler class for Author entities.

modules/custom/az_publication/src/AZAuthorStorageInterface.php

@@ -2,10 +2,10 @@
 
 namespace Drupal\az_publication;
 
-use Drupal\az_publication\Entity\AZAuthorInterface;
 use Drupal\Core\Entity\ContentEntityStorageInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\az_publication\Entity\AZAuthorInterface;
 
 /**
  * Defines the storage handler class for Author entities.

modules/custom/az_publication/src/Controller/AZAuthorController.php

@@ -2,13 +2,13 @@
 
 namespace Drupal\az_publication\Controller;
 
-use Drupal\az_publication\Entity\AZAuthorInterface;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Link;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Url;
+use Drupal\az_publication\Entity\AZAuthorInterface;
 
 /**
  * Class AZAuthorController.

modules/custom/az_publication/src/Form/AZAuthorRevisionRevertForm.php

@@ -2,10 +2,10 @@
 
 namespace Drupal\az_publication\Form;
 
-use Drupal\az_publication\Entity\AZAuthorInterface;
 use Drupal\Core\Form\ConfirmFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
+use Drupal\az_publication\Entity\AZAuthorInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**

modules/custom/az_publication/src/Form/AZAuthorRevisionRevertTranslationForm.php

@@ -2,8 +2,8 @@
 
 namespace Drupal\az_publication\Form;
 
-use Drupal\az_publication\Entity\AZAuthorInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\az_publication\Entity\AZAuthorInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**