diff --git a/examples/Commands/ArtCommands.php b/examples/Commands/ArtCommands.php
index c45d88f214..b1f24145b9 100644
--- a/examples/Commands/ArtCommands.php
+++ b/examples/Commands/ArtCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands;
 
 use Consolidation\AnnotatedCommand\AnnotationData;
@@ -9,7 +10,6 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-
 use Drush\Style\DrushStyle;
 use Drush\Utils\StringUtils;
 
diff --git a/examples/Commands/PolicyCommands.php b/examples/Commands/PolicyCommands.php
index 7601785481..520bfbab12 100644
--- a/examples/Commands/PolicyCommands.php
+++ b/examples/Commands/PolicyCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands;
 
 use Consolidation\AnnotatedCommand\CommandData;
@@ -13,7 +14,6 @@
 
 class PolicyCommands extends DrushCommands
 {
-
     /**
      * Prevent catastrophic braino. Note that this file has to be local to the
      * machine that initiates the sql:sync command.
diff --git a/examples/Commands/SiteAliasAlterCommands.php b/examples/Commands/SiteAliasAlterCommands.php
index a0f0c7e96b..5114079f0b 100644
--- a/examples/Commands/SiteAliasAlterCommands.php
+++ b/examples/Commands/SiteAliasAlterCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands;
 
 use Consolidation\AnnotatedCommand\AnnotationData;
@@ -11,7 +12,6 @@
  */
 class SiteAliasAlterCommands extends DrushCommands implements SiteAliasManagerAwareInterface
 {
-
     use SiteAliasManagerAwareTrait;
 
     /**
diff --git a/examples/Commands/SyncViaHttpCommands.php b/examples/Commands/SyncViaHttpCommands.php
index 369a47766b..3d032abd55 100644
--- a/examples/Commands/SyncViaHttpCommands.php
+++ b/examples/Commands/SyncViaHttpCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands;
 
 use Consolidation\AnnotatedCommand\CommandData;
@@ -13,7 +14,6 @@
 
 class SyncViaHttpCommands extends DrushCommands
 {
-
   /**
    * When a hook extends a command with additional options, it must
    * implement declare those option(s) in a @hook option like this one.  Doing so will add
diff --git a/examples/Commands/XkcdCommands.php b/examples/Commands/XkcdCommands.php
index c8c109b140..1d56497024 100644
--- a/examples/Commands/XkcdCommands.php
+++ b/examples/Commands/XkcdCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands;
 
 use Drush\Attributes\Command;
@@ -17,7 +18,6 @@
 
 class XkcdCommands extends DrushCommands
 {
-
     use ExecTrait;
 
     /**
diff --git a/phpcs.xml b/phpcs.xml
index 717fdb3136..ce4ec74d0e 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -4,10 +4,11 @@
     <file>src</file>
     <file>examples</file>
     <file>tests</file>
-    <rule ref="PSR2"/>
+    <rule ref="PSR12"/>
 
 <!--    Keep us sane-->
     <rule ref="Generic.ControlStructures.InlineControlStructure.NotAllowed"><severity>0</severity></rule>
+    <rule ref="PSR2.Methods.MethodDeclaration.Underscore"><severity>0</severity></rule>
 
     <arg name="warning-severity" value="0"/>
     <arg value="s" />
diff --git a/src/.editorconfig b/src/.editorconfig
index 64b60abd04..1f11b458d9 100644
--- a/src/.editorconfig
+++ b/src/.editorconfig
@@ -1,8 +1,8 @@
 # This file is for unifying the coding style for different editors and IDEs
 # editorconfig.org
 
-# PHP PSR-2 Coding Standards
-# http://www.php-fig.org/psr/psr-2/
+# PHP PSR-12 Coding Standards
+# http://www.php-fig.org/psr/psr-12/
 
 [*.php]
 charset = utf-8
diff --git a/src/Application.php b/src/Application.php
index dea7e9b4db..c54da5ef30 100644
--- a/src/Application.php
+++ b/src/Application.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush;
 
 use Composer\Autoload\ClassLoader;
diff --git a/src/Backend/BackendPathEvaluator.php b/src/Backend/BackendPathEvaluator.php
index ebafd9a175..0272c5e234 100644
--- a/src/Backend/BackendPathEvaluator.php
+++ b/src/Backend/BackendPathEvaluator.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Backend;
 
 use Consolidation\SiteAlias\SiteAlias;
diff --git a/src/Boot/AutoloaderAwareInterface.php b/src/Boot/AutoloaderAwareInterface.php
index d01fe879ad..72724de6f0 100644
--- a/src/Boot/AutoloaderAwareInterface.php
+++ b/src/Boot/AutoloaderAwareInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Boot;
 
 interface AutoloaderAwareInterface
diff --git a/src/Boot/AutoloaderAwareTrait.php b/src/Boot/AutoloaderAwareTrait.php
index a96c0e0b41..bbc13537d2 100644
--- a/src/Boot/AutoloaderAwareTrait.php
+++ b/src/Boot/AutoloaderAwareTrait.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Boot;
 
 trait AutoloaderAwareTrait
diff --git a/src/Boot/EmptyBoot.php b/src/Boot/EmptyBoot.php
index 6f94607781..5869dceb3f 100644
--- a/src/Boot/EmptyBoot.php
+++ b/src/Boot/EmptyBoot.php
@@ -14,7 +14,6 @@
  */
 class EmptyBoot extends BaseBoot
 {
-
     public function validRoot($path): bool
     {
         return false;
diff --git a/src/Boot/Kernels.php b/src/Boot/Kernels.php
index ed0d0e13ae..aa2e395113 100644
--- a/src/Boot/Kernels.php
+++ b/src/Boot/Kernels.php
@@ -11,7 +11,6 @@
  */
 final class Kernels
 {
-
     /**
      * The default kernel that is used on standard requests.
      *
diff --git a/src/Command/DrushCommandInfoAlterer.php b/src/Command/DrushCommandInfoAlterer.php
index 520edf7c23..4fdf1e5955 100644
--- a/src/Command/DrushCommandInfoAlterer.php
+++ b/src/Command/DrushCommandInfoAlterer.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Command;
 
 use Consolidation\AnnotatedCommand\CommandInfoAltererInterface;
diff --git a/src/Command/GlobalOptionsEventListener.php b/src/Command/GlobalOptionsEventListener.php
index 00dd1ebd4a..daeff9351b 100644
--- a/src/Command/GlobalOptionsEventListener.php
+++ b/src/Command/GlobalOptionsEventListener.php
@@ -1,10 +1,10 @@
 <?php
+
 namespace Drush\Command;
 
 use Symfony\Component\Console\ConsoleEvents;
 use Symfony\Component\Console\Event\ConsoleCommandEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
 use Drush\Preflight\LegacyPreflight;
 
 class GlobalOptionsEventListener implements EventSubscriberInterface
diff --git a/src/Command/RemoteCommandProxy.php b/src/Command/RemoteCommandProxy.php
index 5e7d6d40ba..ef7256d854 100644
--- a/src/Command/RemoteCommandProxy.php
+++ b/src/Command/RemoteCommandProxy.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Command;
 
 use Symfony\Component\Console\Command\Command;
@@ -6,7 +7,6 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Drush\Symfony\IndiscriminateInputDefinition;
-
 use Drush\Runtime\RedispatchHook;
 
 /**
diff --git a/src/Command/ServiceCommandlist.php b/src/Command/ServiceCommandlist.php
index 34ffd45286..e1815e9fde 100644
--- a/src/Command/ServiceCommandlist.php
+++ b/src/Command/ServiceCommandlist.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Command;
 
 /**
diff --git a/src/Commands/DrushCommands.php b/src/Commands/DrushCommands.php
index d79889fc9f..9bc426d703 100644
--- a/src/Commands/DrushCommands.php
+++ b/src/Commands/DrushCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands;
 
 use Symfony\Component\Console\Style\SymfonyStyle;
@@ -25,10 +26,15 @@ abstract class DrushCommands implements IOAwareInterface, LoggerAwareInterface,
 {
     use ProcessManagerAwareTrait;
     use ExecTrait;
+    use ConfigAwareTrait;
+    use LoggerAwareTrait;
+    use IO {
+        io as roboIo;
+    }
 
     // This is more readable.
-    const REQ=InputOption::VALUE_REQUIRED;
-    const OPT=InputOption::VALUE_OPTIONAL;
+    const REQ = InputOption::VALUE_REQUIRED;
+    const OPT = InputOption::VALUE_OPTIONAL;
 
     // Common exit codes.
     const EXIT_SUCCESS = 0;
@@ -36,12 +42,6 @@ abstract class DrushCommands implements IOAwareInterface, LoggerAwareInterface,
     // Used to signal that the command completed successfully, but we still want to indicate a failure to the caller.
     const EXIT_FAILURE_WITH_CLARITY = 3;
 
-    use LoggerAwareTrait;
-    use ConfigAwareTrait;
-    use IO {
-        io as roboIo;
-    }
-
     /**
      * @var CommandData
      */
diff --git a/src/Commands/ExampleCommands.php b/src/Commands/ExampleCommands.php
index 8d44afe4b3..75e1ea97c0 100644
--- a/src/Commands/ExampleCommands.php
+++ b/src/Commands/ExampleCommands.php
@@ -1,14 +1,9 @@
 <?php
-namespace Drush\Commands;
 
-/**
- * @file
- *   Set up local Drush configuration.
- */
+namespace Drush\Commands;
 
 use Consolidation\OutputFormatters\StructuredData\RowsOfFields;
 use Consolidation\OutputFormatters\Options\FormatterOptions;
-
 use Consolidation\AnnotatedCommand\CommandData;
 
 class ExampleCommands extends DrushCommands
diff --git a/src/Commands/LegacyCommands.php b/src/Commands/LegacyCommands.php
index 71b561fe8d..6815c42378 100644
--- a/src/Commands/LegacyCommands.php
+++ b/src/Commands/LegacyCommands.php
@@ -1,9 +1,9 @@
 <?php
+
 namespace Drush\Commands;
 
 class LegacyCommands extends DrushCommands
 {
-
     /**
      * Drupal 8 does not support disabling modules. See pm:uninstall command.
      *
diff --git a/src/Commands/OptionsCommands.php b/src/Commands/OptionsCommands.php
index 511f425ce3..885658105e 100644
--- a/src/Commands/OptionsCommands.php
+++ b/src/Commands/OptionsCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands;
 
 /*
@@ -8,8 +9,7 @@
 
 class OptionsCommands
 {
-
-    const REQ=InputOption::VALUE_REQUIRED;
+    const REQ = InputOption::VALUE_REQUIRED;
 
     /**
      * @hook option @optionset_proc_build
diff --git a/src/Commands/ValidatorsCommands.php b/src/Commands/ValidatorsCommands.php
index 28f1f8b3f0..a7a082f38b 100644
--- a/src/Commands/ValidatorsCommands.php
+++ b/src/Commands/ValidatorsCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands;
 
 use Consolidation\AnnotatedCommand\AnnotationData;
diff --git a/src/Commands/config/ConfigPullCommands.php b/src/Commands/config/ConfigPullCommands.php
index d7cc228451..b3fa8ab7b2 100644
--- a/src/Commands/config/ConfigPullCommands.php
+++ b/src/Commands/config/ConfigPullCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\config;
 
 use Consolidation\AnnotatedCommand\CommandData;
diff --git a/src/Commands/core/BrowseCommands.php b/src/Commands/core/BrowseCommands.php
index 8bf9c2f3a3..8ef2cbf910 100644
--- a/src/Commands/core/BrowseCommands.php
+++ b/src/Commands/core/BrowseCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\core;
 
 use Drupal\Core\Url;
diff --git a/src/Commands/core/CacheCommands.php b/src/Commands/core/CacheCommands.php
index c3665c4c59..7ab3d6621e 100644
--- a/src/Commands/core/CacheCommands.php
+++ b/src/Commands/core/CacheCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\core;
 
 use Drupal\Core\Routing\RouteBuilderInterface;
@@ -23,7 +24,6 @@
  */
 class CacheCommands extends DrushCommands implements CustomEventAwareInterface, AutoloaderAwareInterface, StdinAwareInterface
 {
-
     use CustomEventAwareTrait;
     use AutoloaderAwareTrait;
     use StdinAwareTrait;
@@ -353,7 +353,7 @@ public function loadDrupalAutoloader($drupal_root)
     {
         static $autoloader = false;
 
-        $autoloadFilePath = $drupal_root .'/autoload.php';
+        $autoloadFilePath = $drupal_root . '/autoload.php';
         if (!$autoloader && file_exists($autoloadFilePath)) {
             $autoloader = require $autoloadFilePath;
         }
diff --git a/src/Commands/core/CoreCommands.php b/src/Commands/core/CoreCommands.php
index 7bd82e0957..244e6e606d 100644
--- a/src/Commands/core/CoreCommands.php
+++ b/src/Commands/core/CoreCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\core;
 
 use Consolidation\OutputFormatters\StructuredData\PropertyList;
@@ -10,7 +11,6 @@
 
 class CoreCommands extends DrushCommands implements SiteAliasManagerAwareInterface
 {
-
     use SiteAliasManagerAwareTrait;
 
     /**
@@ -33,7 +33,7 @@ public function globalOptions($options = ['format' => 'table']): RowsOfFields
         $application = Drush::getApplication();
         $def = $application->getDefinition();
         foreach ($def->getOptions() as $key => $value) {
-            $name = '--'. $key;
+            $name = '--' . $key;
             if ($value->getShortcut()) {
                 $name = '-' . $value->getShortcut() . ', ' . $name;
             }
diff --git a/src/Commands/core/DeployCommands.php b/src/Commands/core/DeployCommands.php
index ab88271dd5..6029bf88d4 100644
--- a/src/Commands/core/DeployCommands.php
+++ b/src/Commands/core/DeployCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\core;
 
 use Consolidation\SiteAlias\SiteAlias;
diff --git a/src/Commands/core/DocsCommands.php b/src/Commands/core/DocsCommands.php
index 6dd733100d..4a22109a74 100644
--- a/src/Commands/core/DocsCommands.php
+++ b/src/Commands/core/DocsCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\core;
 
 use Consolidation\AnnotatedCommand\CommandData;
diff --git a/src/Commands/core/DrupalDirectoryCommands.php b/src/Commands/core/DrupalDirectoryCommands.php
index b3fd0860f4..45d1d2c51b 100644
--- a/src/Commands/core/DrupalDirectoryCommands.php
+++ b/src/Commands/core/DrupalDirectoryCommands.php
@@ -1,16 +1,15 @@
 <?php
+
 namespace Drush\Commands\core;
 
 use Drush\Commands\DrushCommands;
 use Consolidation\SiteAlias\HostPath;
 use Consolidation\SiteAlias\SiteAliasManagerAwareInterface;
 use Consolidation\SiteAlias\SiteAliasManagerAwareTrait;
-
 use Drush\Backend\BackendPathEvaluator;
 
 class DrupalDirectoryCommands extends DrushCommands implements SiteAliasManagerAwareInterface
 {
-
     use SiteAliasManagerAwareTrait;
 
     /** @var BackendPathEvaluator */
diff --git a/src/Commands/core/DrupliconCommands.php b/src/Commands/core/DrupliconCommands.php
index 60e7d69d19..e15f862095 100644
--- a/src/Commands/core/DrupliconCommands.php
+++ b/src/Commands/core/DrupliconCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\core;
 
 use Consolidation\AnnotatedCommand\CommandData;
diff --git a/src/Commands/core/EditCommands.php b/src/Commands/core/EditCommands.php
index 4ee7d1a92a..3c85c1de0f 100644
--- a/src/Commands/core/EditCommands.php
+++ b/src/Commands/core/EditCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\core;
 
 use Consolidation\SiteProcess\Util\Escape;
diff --git a/src/Commands/core/LoginCommands.php b/src/Commands/core/LoginCommands.php
index 00a5e3d327..2bf5c10665 100644
--- a/src/Commands/core/LoginCommands.php
+++ b/src/Commands/core/LoginCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\core;
 
 use Drupal\user\Entity\User;
@@ -11,7 +12,6 @@
 
 class LoginCommands extends DrushCommands implements SiteAliasManagerAwareInterface
 {
-
     use SiteAliasManagerAwareTrait;
     use ExecTrait;
 
diff --git a/src/Commands/core/NotifyCommands.php b/src/Commands/core/NotifyCommands.php
index 7164923322..3780a55dee 100644
--- a/src/Commands/core/NotifyCommands.php
+++ b/src/Commands/core/NotifyCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\core;
 
 use Consolidation\AnnotatedCommand\CommandData;
diff --git a/src/Commands/core/PhpCommands.php b/src/Commands/core/PhpCommands.php
index fa4f53bfd1..3b078c6db6 100644
--- a/src/Commands/core/PhpCommands.php
+++ b/src/Commands/core/PhpCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\core;
 
 use Consolidation\AnnotatedCommand\Input\StdinAwareInterface;
diff --git a/src/Commands/core/RsyncCommands.php b/src/Commands/core/RsyncCommands.php
index d48d5b39fa..ec45f95ede 100644
--- a/src/Commands/core/RsyncCommands.php
+++ b/src/Commands/core/RsyncCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\core;
 
 use Consolidation\AnnotatedCommand\CommandData;
@@ -74,7 +75,7 @@ public function rsync($source, $target, array $extra, $options = ['exclude-paths
         $parameters[] = Escape::shellArg($this->targetEvaluatedPath->fullyQualifiedPath());
 
         $ssh_options = $this->getConfig()->get('ssh.options', '');
-        $exec = "rsync -e 'ssh $ssh_options'". ' '. implode(' ', array_filter($parameters));
+        $exec = "rsync -e 'ssh $ssh_options'" . ' ' . implode(' ', array_filter($parameters));
         $process = $this->processManager()->shell($exec);
         $process->run($process->showRealtime());
 
@@ -98,7 +99,7 @@ public function rsyncOptions($options): string
             }
         }
 
-        $mode = '-'. $options['mode'];
+        $mode = '-' . $options['mode'];
         if ($this->output()->isVerbose()) {
             $mode .= 'v';
             $verbose = ' --stats --progress';
diff --git a/src/Commands/core/RunserverCommands.php b/src/Commands/core/RunserverCommands.php
index 94d7bba0fb..362cbebbb1 100644
--- a/src/Commands/core/RunserverCommands.php
+++ b/src/Commands/core/RunserverCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\core;
 
 use Consolidation\SiteProcess\Util\Tty;
@@ -10,7 +11,6 @@
 
 class RunserverCommands extends DrushCommands
 {
-
     use ExecTrait;
 
     protected $uri;
diff --git a/src/Commands/core/SiteCommands.php b/src/Commands/core/SiteCommands.php
index 06fddfe336..3cc9a9e550 100644
--- a/src/Commands/core/SiteCommands.php
+++ b/src/Commands/core/SiteCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\core;
 
 use Drush\Commands\DrushCommands;
diff --git a/src/Commands/core/SiteInstallCommands.php b/src/Commands/core/SiteInstallCommands.php
index 8326523605..68a288c1c2 100644
--- a/src/Commands/core/SiteInstallCommands.php
+++ b/src/Commands/core/SiteInstallCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\core;
 
 use Composer\Semver\Comparator;
diff --git a/src/Commands/core/SshCommands.php b/src/Commands/core/SshCommands.php
index 273fff2a6c..2ae6f1d458 100644
--- a/src/Commands/core/SshCommands.php
+++ b/src/Commands/core/SshCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\core;
 
 use Consolidation\SiteProcess\Util\Shell;
diff --git a/src/Commands/core/TopicCommands.php b/src/Commands/core/TopicCommands.php
index 29bf3a24b6..a1721aabe6 100644
--- a/src/Commands/core/TopicCommands.php
+++ b/src/Commands/core/TopicCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\core;
 
 use Consolidation\AnnotatedCommand\AnnotationData;
@@ -14,7 +15,6 @@
 
 class TopicCommands extends DrushCommands
 {
-
     /**
      * Read detailed documentation on a given topic.
      *
diff --git a/src/Commands/core/UpdateDBCommands.php b/src/Commands/core/UpdateDBCommands.php
index 79cbd4edb4..0d837c99a8 100644
--- a/src/Commands/core/UpdateDBCommands.php
+++ b/src/Commands/core/UpdateDBCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\core;
 
 use Consolidation\Log\ConsoleLogLevel;
@@ -144,7 +145,7 @@ public function entityUpdates($options = ['cache-clear' => true]): void
      * @filter-default-field type
      * @return RowsOfFields
      */
-    public function updatedbStatus($options = ['format'=> 'table', 'entity-updates' => true, 'post-updates' => true])
+    public function updatedbStatus($options = ['format' => 'table', 'entity-updates' => true, 'post-updates' => true])
     {
         require_once DRUSH_DRUPAL_CORE . '/includes/install.inc';
         drupal_load_updates();
@@ -563,7 +564,7 @@ public function getUpdatedbStatus(array $options): array
                         'module' => $module,
                         'update_id' => $update_id,
                         'description' => $description,
-                        'type'=> 'hook_update_n'
+                        'type' => 'hook_update_n'
                     ];
                 }
                 if (isset($updates['start'])) {
@@ -574,8 +575,10 @@ public function getUpdatedbStatus(array $options): array
 
         // Append row(s) for pending entity definition updates.
         if ($options['entity-updates']) {
-            foreach (\Drupal::entityDefinitionUpdateManager()
-                         ->getChangeSummary() as $entity_type_id => $changes) {
+            foreach (
+                \Drupal::entityDefinitionUpdateManager()
+                         ->getChangeSummary() as $entity_type_id => $changes
+            ) {
                 foreach ($changes as $change) {
                     $return[] = [
                         'module' => dt('@type entity type', ['@type' => $entity_type_id]),
@@ -671,7 +674,7 @@ public function updateCheckRequirements(): bool
                 if (isset($requirement['severity']) && $requirement['severity'] != REQUIREMENT_OK) {
                     $message = isset($requirement['description']) ? DrupalUtil::drushRender($requirement['description']) : '';
                     if (isset($requirement['value']) && $requirement['value']) {
-                        $message .= ' (Currently using '. $requirement['title'] .' '. DrupalUtil::drushRender($requirement['value']) .')';
+                        $message .= ' (Currently using ' . $requirement['title'] . ' ' . DrupalUtil::drushRender($requirement['value']) . ')';
                     }
                     $log_level = $requirement['severity'] === REQUIREMENT_ERROR ? LogLevel::ERROR : LogLevel::WARNING;
                     $this->logger()->log($log_level, $message);
diff --git a/src/Commands/core/XhprofCommands.php b/src/Commands/core/XhprofCommands.php
index 80dff899af..af401a3d73 100644
--- a/src/Commands/core/XhprofCommands.php
+++ b/src/Commands/core/XhprofCommands.php
@@ -23,7 +23,6 @@
  */
 class XhprofCommands extends DrushCommands
 {
-
     const XH_PROFILE_MEMORY = false;
     const XH_PROFILE_CPU = false;
     const XH_PROFILE_BUILTINS = true;
diff --git a/src/Commands/generate/ApplicationFactory.php b/src/Commands/generate/ApplicationFactory.php
index f67963ce98..c4ee7a3270 100644
--- a/src/Commands/generate/ApplicationFactory.php
+++ b/src/Commands/generate/ApplicationFactory.php
@@ -176,7 +176,7 @@ protected function getGenerators(array $classes): array
     {
         return array_map(
             function (string $class): Generator {
-                return new $class;
+                return new $class();
             },
             array_filter($classes, function (string $class): bool {
                 $reflectionClass = new \ReflectionClass($class);
diff --git a/src/Commands/generate/GenerateCommands.php b/src/Commands/generate/GenerateCommands.php
index db02125df0..412f5ee58b 100644
--- a/src/Commands/generate/GenerateCommands.php
+++ b/src/Commands/generate/GenerateCommands.php
@@ -13,7 +13,6 @@
  */
 class GenerateCommands extends DrushCommands implements AutoloaderAwareInterface
 {
-
     use AutoloaderAwareTrait;
 
     /**
diff --git a/src/Commands/help/DrushHelpDocument.php b/src/Commands/help/DrushHelpDocument.php
index 8bd2fc0a61..dfe51f9216 100644
--- a/src/Commands/help/DrushHelpDocument.php
+++ b/src/Commands/help/DrushHelpDocument.php
@@ -7,7 +7,6 @@
 
 class DrushHelpDocument extends HelpDocument
 {
-
     /**
      * @inheritdoc
      */
diff --git a/src/Commands/help/HelpCLIFormatter.php b/src/Commands/help/HelpCLIFormatter.php
index e272dd9455..3c63fc1e92 100644
--- a/src/Commands/help/HelpCLIFormatter.php
+++ b/src/Commands/help/HelpCLIFormatter.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\help;
 
 use Consolidation\OutputFormatters\FormatterManager;
@@ -13,7 +14,6 @@
  */
 class HelpCLIFormatter implements FormatterInterface
 {
-
     /**
      * @inheritdoc
      */
@@ -89,10 +89,10 @@ public static function formatOptionKeys(iterable $option): string
 
         $value = '';
         if ($option['accept_value']) {
-            $value = '='.strtoupper($option['name']);
+            $value = '=' . strtoupper($option['name']);
 
             if (!$option['is_value_required']) {
-                $value = '['.$value.']';
+                $value = '[' . $value . ']';
             }
         }
 
@@ -122,9 +122,9 @@ public static function formatArgumentName($argument)
     {
         $element = $argument['name'];
         if (!$argument['is_required']) {
-            $element = '['.$element.']';
+            $element = '[' . $element . ']';
         } elseif ($argument['is_array']) {
-            $element = $element.' ('.$element.')';
+            $element = $element . ' (' . $element . ')';
         }
 
         if ($argument['is_array']) {
diff --git a/src/Commands/help/HelpCommands.php b/src/Commands/help/HelpCommands.php
index a10869f308..ae9ce0565b 100644
--- a/src/Commands/help/HelpCommands.php
+++ b/src/Commands/help/HelpCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\help;
 
 use Consolidation\AnnotatedCommand\AnnotatedCommand;
@@ -8,7 +9,6 @@
 
 class HelpCommands extends DrushCommands
 {
-
     /**
      * Display usage details for a command.
      *
diff --git a/src/Commands/help/ListCommands.php b/src/Commands/help/ListCommands.php
index 64a1aa7db9..de469fadf3 100644
--- a/src/Commands/help/ListCommands.php
+++ b/src/Commands/help/ListCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\help;
 
 use Symfony\Component\Console\Application;
diff --git a/src/Commands/pm/SecurityUpdateCommands.php b/src/Commands/pm/SecurityUpdateCommands.php
index f08c2a7eed..4ac6cd3e06 100644
--- a/src/Commands/pm/SecurityUpdateCommands.php
+++ b/src/Commands/pm/SecurityUpdateCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\pm;
 
 use GuzzleHttp\Client;
@@ -17,7 +18,6 @@
  */
 class SecurityUpdateCommands extends DrushCommands
 {
-
     /**
      * Return path to composer.lock
      *
diff --git a/src/Commands/sql/SqlCommands.php b/src/Commands/sql/SqlCommands.php
index 3f468dd484..863d24714f 100644
--- a/src/Commands/sql/SqlCommands.php
+++ b/src/Commands/sql/SqlCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\sql;
 
 use Consolidation\AnnotatedCommand\CommandData;
diff --git a/src/Commands/sql/SqlSyncCommands.php b/src/Commands/sql/SqlSyncCommands.php
index b1000ac610..a7ec536c7d 100644
--- a/src/Commands/sql/SqlSyncCommands.php
+++ b/src/Commands/sql/SqlSyncCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands\sql;
 
 use Consolidation\AnnotatedCommand\CommandData;
diff --git a/src/Config/ConfigAwareTrait.php b/src/Config/ConfigAwareTrait.php
index 47e8464da8..8c8bdb0d9c 100644
--- a/src/Config/ConfigAwareTrait.php
+++ b/src/Config/ConfigAwareTrait.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Config;
 
 trait ConfigAwareTrait
diff --git a/src/Config/ConfigLocator.php b/src/Config/ConfigLocator.php
index 361dadb63f..3ace69137b 100644
--- a/src/Config/ConfigLocator.php
+++ b/src/Config/ConfigLocator.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Config;
 
 use Consolidation\Config\ConfigInterface;
diff --git a/src/Config/DrushConfig.php b/src/Config/DrushConfig.php
index 460bd697c1..32ef70677e 100644
--- a/src/Config/DrushConfig.php
+++ b/src/Config/DrushConfig.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Config;
 
 use Robo\Config\Config;
@@ -6,7 +7,6 @@
 use Symfony\Component\Filesystem\Exception\IOException;
 use Symfony\Component\Filesystem\Filesystem;
 use Webmozart\PathUtil\Path;
-
 // TODO: Not sure if we should have a reference to PreflightArgs here.
 // Maybe these constants should be in config, and PreflightArgs can
 // reference them from there as well.
diff --git a/src/Config/Environment.php b/src/Config/Environment.php
index 69b21eeb69..2804f77167 100644
--- a/src/Config/Environment.php
+++ b/src/Config/Environment.php
@@ -1,8 +1,8 @@
 <?php
+
 namespace Drush\Config;
 
 use Composer\Autoload\ClassLoader;
-
 use Drush\Drush;
 use Drush\Utils\FsUtils;
 use Symfony\Component\Console\Terminal;
diff --git a/src/Drupal/Commands/config/ConfigCommands.php b/src/Drupal/Commands/config/ConfigCommands.php
index d3116d5ac6..b2ae4dac07 100644
--- a/src/Drupal/Commands/config/ConfigCommands.php
+++ b/src/Drupal/Commands/config/ConfigCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Drupal\Commands\config;
 
 use Drupal\Core\Config\ImportStorageTransformer;
diff --git a/src/Drupal/Commands/config/ConfigExportCommands.php b/src/Drupal/Commands/config/ConfigExportCommands.php
index 00eda1d17f..9495c8118e 100644
--- a/src/Drupal/Commands/config/ConfigExportCommands.php
+++ b/src/Drupal/Commands/config/ConfigExportCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Drupal\Commands\config;
 
 use Consolidation\AnnotatedCommand\CommandData;
@@ -177,7 +178,7 @@ public function doAddCommit($options, $destination_dir, $preview): void
             if (!empty($uncommitted_changes)) {
                 $process = $this->processManager()->process(['git', 'add', '-A', '.'], $destination_dir);
                 $process->mustRun();
-                $comment_file = drush_save_data_to_temp_file($options['message'] ?: 'Exported configuration.'. $preview);
+                $comment_file = drush_save_data_to_temp_file($options['message'] ?: 'Exported configuration.' . $preview);
                 $process = $this->processManager()->process(['git', 'commit', "--file=$comment_file"], $destination_dir);
                 $process->mustRun();
             }
diff --git a/src/Drupal/Commands/config/ConfigImportCommands.php b/src/Drupal/Commands/config/ConfigImportCommands.php
index f73203230a..3279d4cb54 100644
--- a/src/Drupal/Commands/config/ConfigImportCommands.php
+++ b/src/Drupal/Commands/config/ConfigImportCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Drupal\Commands\config;
 
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -28,7 +29,6 @@
 
 class ConfigImportCommands extends DrushCommands
 {
-
     /**
      * @var ConfigManagerInterface
      */
diff --git a/src/Drupal/Commands/core/BatchCommands.php b/src/Drupal/Commands/core/BatchCommands.php
index fb0d1654fd..4c7f947dbe 100644
--- a/src/Drupal/Commands/core/BatchCommands.php
+++ b/src/Drupal/Commands/core/BatchCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Drupal\Commands\core;
 
 use Consolidation\OutputFormatters\StructuredData\UnstructuredListData;
@@ -6,7 +7,6 @@
 
 class BatchCommands extends DrushCommands
 {
-
     /**
      * Process operations in the specified batch set.
      *
diff --git a/src/Drupal/Commands/core/CliCommands.php b/src/Drupal/Commands/core/CliCommands.php
index 0ceea8d906..1369910c48 100644
--- a/src/Drupal/Commands/core/CliCommands.php
+++ b/src/Drupal/Commands/core/CliCommands.php
@@ -16,7 +16,6 @@
 
 class CliCommands extends DrushCommands
 {
-
     /**
      * Drush's PHP Shell.
      *
diff --git a/src/Drupal/Commands/core/DeployHookCommands.php b/src/Drupal/Commands/core/DeployHookCommands.php
index c3e75ec2a3..f6477eea2d 100644
--- a/src/Drupal/Commands/core/DeployHookCommands.php
+++ b/src/Drupal/Commands/core/DeployHookCommands.php
@@ -24,7 +24,7 @@ class DeployHookCommands extends DrushCommands implements SiteAliasManagerAwareI
      */
     public static function getRegistry(): UpdateRegistry
     {
-        $registry = new class(
+        $registry = new class (
             \Drupal::service('app.root'),
             \Drupal::service('site.path'),
             array_keys(\Drupal::service('module_handler')->getModuleList()),
diff --git a/src/Drupal/Commands/core/DrupalCommands.php b/src/Drupal/Commands/core/DrupalCommands.php
index a4b615d2a5..d39630cece 100644
--- a/src/Drupal/Commands/core/DrupalCommands.php
+++ b/src/Drupal/Commands/core/DrupalCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Drupal\Commands\core;
 
 use Consolidation\OutputFormatters\StructuredData\RowsOfFields;
@@ -12,7 +13,6 @@
 
 class DrupalCommands extends DrushCommands
 {
-
     /**
      * @var CronInterface
      */
@@ -149,7 +149,7 @@ public function requirements($options = ['format' => 'table', 'severity' => -1,
      * @option path An internal path.
      * @version 10.5
      */
-    public function route($options = ['name' => self::REQ, 'path' =>self::REQ, 'format' => 'yaml'])
+    public function route($options = ['name' => self::REQ, 'path' => self::REQ, 'format' => 'yaml'])
     {
         $route = $items = null;
         $provider = $this->getRouteProvider();
@@ -182,13 +182,15 @@ public function route($options = ['name' => self::REQ, 'path' =>self::REQ, 'form
         }
         return $items;
     }
-    
+
     private static function styleRow($content, $format, $severity): ?string
     {
-        if (!in_array($format, [
+        if (
+            !in_array($format, [
             'sections',
             'table',
-        ])) {
+            ])
+        ) {
             return $content;
         }
 
diff --git a/src/Drupal/Commands/core/EntityCommands.php b/src/Drupal/Commands/core/EntityCommands.php
index 38408d6617..f857e82f01 100644
--- a/src/Drupal/Commands/core/EntityCommands.php
+++ b/src/Drupal/Commands/core/EntityCommands.php
@@ -12,7 +12,6 @@
 
 class EntityCommands extends DrushCommands
 {
-
     protected $entityTypeManager;
 
     /**
diff --git a/src/Drupal/Commands/core/ImageCommands.php b/src/Drupal/Commands/core/ImageCommands.php
index c8f764bb65..7593e03717 100644
--- a/src/Drupal/Commands/core/ImageCommands.php
+++ b/src/Drupal/Commands/core/ImageCommands.php
@@ -10,7 +10,6 @@
 
 class ImageCommands extends DrushCommands
 {
-
     /**
      * Flush all derived images for a given style.
      *
diff --git a/src/Drupal/Commands/core/JsonapiCommands.php b/src/Drupal/Commands/core/JsonapiCommands.php
index bb6e664932..02ea0efbf4 100644
--- a/src/Drupal/Commands/core/JsonapiCommands.php
+++ b/src/Drupal/Commands/core/JsonapiCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Drupal\Commands\core;
 
 use Consolidation\OutputFormatters\StructuredData\UnstructuredData;
@@ -9,7 +10,6 @@
 
 class JsonapiCommands extends DrushCommands
 {
-
     /**
      * Execute a JSONAPI request.
      *
diff --git a/src/Drupal/Commands/core/LanguageCommands.php b/src/Drupal/Commands/core/LanguageCommands.php
index d052c1e998..cc7245fc60 100644
--- a/src/Drupal/Commands/core/LanguageCommands.php
+++ b/src/Drupal/Commands/core/LanguageCommands.php
@@ -11,7 +11,6 @@
 
 class LanguageCommands extends DrushCommands
 {
-
     /**
      * @var LanguageManagerInterface
      */
diff --git a/src/Drupal/Commands/core/LinkHooks.php b/src/Drupal/Commands/core/LinkHooks.php
index 646e28e2e8..0606e665cc 100644
--- a/src/Drupal/Commands/core/LinkHooks.php
+++ b/src/Drupal/Commands/core/LinkHooks.php
@@ -46,7 +46,8 @@ public function hookOption(Command $command, AnnotationData $annotationData): vo
     /** @hook on-event field-create-set-options */
     public function hookSetOptions(InputInterface $input): void
     {
-        if (!$this->isInstalled()
+        if (
+            !$this->isInstalled()
             || $input->getOption('field-type') !== 'link'
         ) {
             return;
@@ -66,7 +67,8 @@ public function hookSetOptions(InputInterface $input): void
     /** @hook on-event field-create-field-config */
     public function hookFieldConfig(array $values, InputInterface $input): array
     {
-        if (!$this->isInstalled()
+        if (
+            !$this->isInstalled()
             || $values['field_type'] !== 'link'
         ) {
             return $values;
diff --git a/src/Drupal/Commands/core/LocaleCommands.php b/src/Drupal/Commands/core/LocaleCommands.php
index a73a282296..6649a30799 100644
--- a/src/Drupal/Commands/core/LocaleCommands.php
+++ b/src/Drupal/Commands/core/LocaleCommands.php
@@ -17,7 +17,6 @@
 
 class LocaleCommands extends DrushCommands
 {
-
     protected $languageManager;
 
     protected $configFactory;
diff --git a/src/Drupal/Commands/core/QueueCommands.php b/src/Drupal/Commands/core/QueueCommands.php
index 76a483870f..5761ccc937 100644
--- a/src/Drupal/Commands/core/QueueCommands.php
+++ b/src/Drupal/Commands/core/QueueCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Drupal\Commands\core;
 
 use Drupal\Core\Queue\QueueWorkerManager;
@@ -16,7 +17,6 @@
 
 class QueueCommands extends DrushCommands
 {
-
     /**
      * @var QueueWorkerManager
      */
diff --git a/src/Drupal/Commands/core/RoleCommands.php b/src/Drupal/Commands/core/RoleCommands.php
index 59a350c315..70752e0d69 100644
--- a/src/Drupal/Commands/core/RoleCommands.php
+++ b/src/Drupal/Commands/core/RoleCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Drupal\Commands\core;
 
 use Consolidation\OutputFormatters\Options\FormatterOptions;
diff --git a/src/Drupal/Commands/core/StateCommands.php b/src/Drupal/Commands/core/StateCommands.php
index 66c3dfedd9..5ca494beed 100644
--- a/src/Drupal/Commands/core/StateCommands.php
+++ b/src/Drupal/Commands/core/StateCommands.php
@@ -119,7 +119,7 @@ public static function format($value, $format)
         // Now, we parse the object.
         switch ($format) {
             case 'integer':
-                $value = (integer)$value;
+                $value = (int)$value;
                 break;
             // from: http://php.net/gettype
             // for historical reasons "double" is returned in case of a float, and not simply "float"
diff --git a/src/Drupal/Commands/core/UserCommands.php b/src/Drupal/Commands/core/UserCommands.php
index 12c4dfcca4..23caeb9deb 100644
--- a/src/Drupal/Commands/core/UserCommands.php
+++ b/src/Drupal/Commands/core/UserCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Drupal\Commands\core;
 
 use Drupal\Core\Datetime\DateFormatterInterface;
@@ -13,7 +14,6 @@
 
 class UserCommands extends DrushCommands
 {
-
     /**
      * @var DateFormatterInterface
      */
diff --git a/src/Drupal/Commands/core/ViewsCommands.php b/src/Drupal/Commands/core/ViewsCommands.php
index dfffc46115..2a7d18f14c 100644
--- a/src/Drupal/Commands/core/ViewsCommands.php
+++ b/src/Drupal/Commands/core/ViewsCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Drupal\Commands\core;
 
 use Consolidation\OutputFormatters\StructuredData\RowsOfFields;
@@ -12,7 +13,6 @@
 
 class ViewsCommands extends DrushCommands
 {
-
     protected $configFactory;
 
     protected $moduleHandler;
diff --git a/src/Drupal/Commands/core/WatchdogCommands.php b/src/Drupal/Commands/core/WatchdogCommands.php
index b09792793a..bf43f378ac 100644
--- a/src/Drupal/Commands/core/WatchdogCommands.php
+++ b/src/Drupal/Commands/core/WatchdogCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Drupal\Commands\core;
 
 use Consolidation\OutputFormatters\StructuredData\PropertyList;
@@ -15,7 +16,6 @@
 
 class WatchdogCommands extends DrushCommands
 {
-
     /**
      * Show watchdog messages.
      *
@@ -240,7 +240,7 @@ public function delete($substring = '', $options = ['severity' => self::REQ, 'ty
                 throw new \Exception(dt('Watchdog message #!wid does not exist.', ['!wid' => $substring]));
             }
         } else {
-            if ((empty($substring))&&(!isset($options['type']))&&(!isset($options['severity']))) {
+            if ((empty($substring)) && (!isset($options['type'])) && (!isset($options['severity']))) {
                 throw new \Exception(dt('No options provided.'));
             }
             $where = $this->where($options['type'], $options['severity'], $substring, 'OR');
@@ -325,7 +325,7 @@ protected function where($type = null, $severity = null, $filter = null, $criter
         }
         if ($filter) {
             $conditions[] = "message LIKE :filter";
-            $args[':filter'] = '%'.$filter.'%';
+            $args[':filter'] = '%' . $filter . '%';
         }
 
         $where = implode(" $criteria ", $conditions);
diff --git a/src/Drupal/Commands/field/FieldCreateCommands.php b/src/Drupal/Commands/field/FieldCreateCommands.php
index 326eedd56d..395b73baad 100644
--- a/src/Drupal/Commands/field/FieldCreateCommands.php
+++ b/src/Drupal/Commands/field/FieldCreateCommands.php
@@ -607,7 +607,8 @@ protected function getExistingFieldStorageOptions(string $entityType, string $bu
                 ? $fieldTypes[$fieldType]['id']
                 : $fieldTypes[$fieldType]['label'];
 
-            if ($fieldStorage instanceof FieldStorageConfigInterface
+            if (
+                $fieldStorage instanceof FieldStorageConfigInterface
                 && !$fieldStorage->isLocked()
                 && empty($fieldTypes[$fieldType]['no_ui'])
                 && !in_array($bundle, $fieldStorage->getBundles(), true)
diff --git a/src/Drupal/Commands/pm/PmCommands.php b/src/Drupal/Commands/pm/PmCommands.php
index 051bea0160..1e00ac2087 100644
--- a/src/Drupal/Commands/pm/PmCommands.php
+++ b/src/Drupal/Commands/pm/PmCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Drupal\Commands\pm;
 
 use Consolidation\AnnotatedCommand\CommandData;
@@ -16,7 +17,6 @@
 
 class PmCommands extends DrushCommands
 {
-
     protected $configFactory;
 
     protected $moduleInstaller;
@@ -263,7 +263,7 @@ public function pmList($options = ['format' => 'table', 'type' => 'module,theme'
             $row = [
                 'package' => $extension->info['package'],
                 'project' => isset($extension->info['project']) ? $extension->info['project'] : '',
-                'display_name' => $extension->info['name']. ' ('. $extension->getName(). ')',
+                'display_name' => $extension->info['name'] . ' (' . $extension->getName() . ')',
                 'name' => $extension->getName(),
                 'type' => $extension->getType(),
                 'path' => $extension->getPath(),
diff --git a/src/Drupal/Commands/pm/ThemeCommands.php b/src/Drupal/Commands/pm/ThemeCommands.php
index dc09ea6d9f..55be734b9e 100644
--- a/src/Drupal/Commands/pm/ThemeCommands.php
+++ b/src/Drupal/Commands/pm/ThemeCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Drupal\Commands\pm;
 
 use Drupal\Core\Extension\ThemeInstallerInterface;
@@ -8,7 +9,6 @@
 
 class ThemeCommands extends DrushCommands
 {
-
     protected $themeInstaller;
 
     public function __construct(ThemeInstallerInterface $themeInstaller)
diff --git a/src/Drupal/Commands/sql/SanitizeCommands.php b/src/Drupal/Commands/sql/SanitizeCommands.php
index 6c198f489b..ada181dde5 100644
--- a/src/Drupal/Commands/sql/SanitizeCommands.php
+++ b/src/Drupal/Commands/sql/SanitizeCommands.php
@@ -9,7 +9,6 @@
 
 class SanitizeCommands extends DrushCommands implements CustomEventAwareInterface
 {
-
     use CustomEventAwareTrait;
 
     /**
diff --git a/src/Drupal/Commands/sql/SanitizeCommentsCommands.php b/src/Drupal/Commands/sql/SanitizeCommentsCommands.php
index aa2572948c..0c73b6a810 100644
--- a/src/Drupal/Commands/sql/SanitizeCommentsCommands.php
+++ b/src/Drupal/Commands/sql/SanitizeCommentsCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Drupal\Commands\sql;
 
 use Consolidation\AnnotatedCommand\CommandData;
diff --git a/src/Drupal/Commands/sql/SanitizeSessionsCommands.php b/src/Drupal/Commands/sql/SanitizeSessionsCommands.php
index 9a8e62493c..5a04c230f7 100644
--- a/src/Drupal/Commands/sql/SanitizeSessionsCommands.php
+++ b/src/Drupal/Commands/sql/SanitizeSessionsCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Drupal\Commands\sql;
 
 use Consolidation\AnnotatedCommand\CommandData;
diff --git a/src/Drupal/Commands/sql/SanitizeUserFieldsCommands.php b/src/Drupal/Commands/sql/SanitizeUserFieldsCommands.php
index 522352d8e0..b54b44bbb6 100644
--- a/src/Drupal/Commands/sql/SanitizeUserFieldsCommands.php
+++ b/src/Drupal/Commands/sql/SanitizeUserFieldsCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Drupal\Commands\sql;
 
 use Consolidation\AnnotatedCommand\CommandData;
diff --git a/src/Drupal/Commands/sql/SanitizeUserTableCommands.php b/src/Drupal/Commands/sql/SanitizeUserTableCommands.php
index 48350208cf..95fa751318 100644
--- a/src/Drupal/Commands/sql/SanitizeUserTableCommands.php
+++ b/src/Drupal/Commands/sql/SanitizeUserTableCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Drupal\Commands\sql;
 
 use Consolidation\AnnotatedCommand\CommandData;
diff --git a/src/Drupal/DrupalUtil.php b/src/Drupal/DrupalUtil.php
index 21b476ae6c..5b2b049b1c 100644
--- a/src/Drupal/DrupalUtil.php
+++ b/src/Drupal/DrupalUtil.php
@@ -1,11 +1,11 @@
 <?php
+
 namespace Drush\Drupal;
 
 use Drupal\Core\Mail\MailFormatHelper;
 
 class DrupalUtil
 {
-
     /**
      * Output a Drupal render array, object or string as plain text.
      *
diff --git a/src/Drupal/FindCommandsCompilerPass.php b/src/Drupal/FindCommandsCompilerPass.php
index 505702142f..ccfaa354db 100644
--- a/src/Drupal/FindCommandsCompilerPass.php
+++ b/src/Drupal/FindCommandsCompilerPass.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Drupal;
 
 use Drush\Drush;
diff --git a/src/Drupal/InstallerKernel.php b/src/Drupal/InstallerKernel.php
index f696bdd57c..e8b4e3310a 100644
--- a/src/Drupal/InstallerKernel.php
+++ b/src/Drupal/InstallerKernel.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Drupal;
 
 use Drupal\Core\Installer\InstallerKernel as DrupalInstallerKernel;
diff --git a/src/Drupal/Migrate/MigrateIdMapFilter.php b/src/Drupal/Migrate/MigrateIdMapFilter.php
index 81e9863b7b..ed45af4e0b 100644
--- a/src/Drupal/Migrate/MigrateIdMapFilter.php
+++ b/src/Drupal/Migrate/MigrateIdMapFilter.php
@@ -9,7 +9,6 @@
  */
 class MigrateIdMapFilter extends \FilterIterator
 {
-
     /**
      * List of specific source IDs to filter on.
      */
diff --git a/src/Drupal/UpdateKernel.php b/src/Drupal/UpdateKernel.php
index 5632fd38f8..581672542a 100644
--- a/src/Drupal/UpdateKernel.php
+++ b/src/Drupal/UpdateKernel.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Drupal;
 
 use Drupal\Core\Update\UpdateKernel as DrupalUpdateKernel;
diff --git a/src/Drush.php b/src/Drush.php
index 8c38f399cc..097ea42be2 100644
--- a/src/Drush.php
+++ b/src/Drush.php
@@ -4,6 +4,7 @@
  * @file
  * Contains \Drush.
  */
+
 namespace Drush;
 
 use Robo\Runner;
@@ -24,7 +25,6 @@
 use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-
 // TODO: Not sure if we should have a reference to PreflightArgs here.
 // Maybe these constants should be in config, and PreflightArgs can
 // reference them from there as well.
@@ -51,7 +51,6 @@
  */
 class Drush
 {
-
     /**
      * The version of Drush from the drush.info file, or FALSE if not read yet.
      *
diff --git a/src/Exec/ExecTrait.php b/src/Exec/ExecTrait.php
index 10177ee999..49bc5d67c1 100644
--- a/src/Exec/ExecTrait.php
+++ b/src/Exec/ExecTrait.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Exec;
 
 use Consolidation\SiteProcess\Util\Shell;
diff --git a/src/Formatters/DrushFormatterManager.php b/src/Formatters/DrushFormatterManager.php
index 04e2ef7a75..eceffc9618 100644
--- a/src/Formatters/DrushFormatterManager.php
+++ b/src/Formatters/DrushFormatterManager.php
@@ -7,7 +7,7 @@
 
 namespace Drush\Formatters;
 
-use \Consolidation\OutputFormatters\FormatterManager;
+use Consolidation\OutputFormatters\FormatterManager;
 
 /**
  * Our own output formatter
diff --git a/src/Log/Logger.php b/src/Log/Logger.php
index 72c6de9446..9078c7598b 100644
--- a/src/Log/Logger.php
+++ b/src/Log/Logger.php
@@ -26,7 +26,6 @@
 
 class Logger extends RoboLogger
 {
-
     public function __construct(OutputInterface $output)
     {
         parent::__construct($output);
diff --git a/src/Preflight/ArgsPreprocessor.php b/src/Preflight/ArgsPreprocessor.php
index 8d39f13980..b5092d664c 100644
--- a/src/Preflight/ArgsPreprocessor.php
+++ b/src/Preflight/ArgsPreprocessor.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Preflight;
 
 use Consolidation\SiteAlias\SiteAliasName;
@@ -174,7 +175,7 @@ protected function checkMatchingOption($opt, $keyParam, $methodName): array
         // argument in the calling function. If this option does not take a
         // supplied value, then we set its value to 'true'
         if (strlen($key) === strlen($opt)) {
-            return [$methodName, $acceptsValue ? null: true, $acceptsValueFromNextArg];
+            return [$methodName, $acceptsValue ? null : true, $acceptsValueFromNextArg];
         }
 
         // If the option is not an exact match for the key, then the next
diff --git a/src/Preflight/ArgsRemapper.php b/src/Preflight/ArgsRemapper.php
index 55237e7a4e..a12d3d9502 100644
--- a/src/Preflight/ArgsRemapper.php
+++ b/src/Preflight/ArgsRemapper.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Preflight;
 
 /**
diff --git a/src/Preflight/LegacyPreflight.php b/src/Preflight/LegacyPreflight.php
index cda54ff026..283c447c80 100644
--- a/src/Preflight/LegacyPreflight.php
+++ b/src/Preflight/LegacyPreflight.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Preflight;
 
 use Drush\Drush;
diff --git a/src/Preflight/Preflight.php b/src/Preflight/Preflight.php
index fcdbd6226e..89475eb6f9 100644
--- a/src/Preflight/Preflight.php
+++ b/src/Preflight/Preflight.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Preflight;
 
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/src/Preflight/PreflightArgs.php b/src/Preflight/PreflightArgs.php
index f9dae5c847..2654295dfc 100644
--- a/src/Preflight/PreflightArgs.php
+++ b/src/Preflight/PreflightArgs.php
@@ -1,10 +1,10 @@
 <?php
+
 namespace Drush\Preflight;
 
 use Symfony\Component\Console\Input\InputInterface;
 use Consolidation\Config\Config;
 use Consolidation\Config\ConfigInterface;
-
 use Drush\Symfony\DrushArgvInput;
 use Drush\Utils\StringUtils;
 use Drush\Symfony\LessStrictArgvInput;
@@ -20,7 +20,6 @@
  */
 class PreflightArgs extends Config implements PreflightArgsInterface
 {
-
     /**
      * @var array $args Remaining arguments not handled by the preprocessor
      */
diff --git a/src/Preflight/PreflightArgsInterface.php b/src/Preflight/PreflightArgsInterface.php
index b3977d6dd3..ac56162d6b 100644
--- a/src/Preflight/PreflightArgsInterface.php
+++ b/src/Preflight/PreflightArgsInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Preflight;
 
 use Consolidation\Config\ConfigInterface;
diff --git a/src/Preflight/PreflightVerify.php b/src/Preflight/PreflightVerify.php
index 8c4218de56..60f05f310c 100644
--- a/src/Preflight/PreflightVerify.php
+++ b/src/Preflight/PreflightVerify.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Preflight;
 
 use Drush\Config\Environment;
diff --git a/src/Preflight/RedispatchToSiteLocal.php b/src/Preflight/RedispatchToSiteLocal.php
index 76b52d3ff4..7a15dd4e62 100644
--- a/src/Preflight/RedispatchToSiteLocal.php
+++ b/src/Preflight/RedispatchToSiteLocal.php
@@ -13,7 +13,6 @@
  */
 class RedispatchToSiteLocal
 {
-
     /**
      * Determine if a local redispatch is needed, and do so if it is.
      *
diff --git a/src/Psysh/Caster.php b/src/Psysh/Caster.php
index 7e806b5aa5..f434b71e23 100644
--- a/src/Psysh/Caster.php
+++ b/src/Psysh/Caster.php
@@ -14,7 +14,6 @@
  */
 class Caster
 {
-
     /**
      * Casts \Drupal\Core\Entity\ContentEntityInterface classes.
      */
diff --git a/src/Psysh/DrushCommand.php b/src/Psysh/DrushCommand.php
index 90c2d7bbea..f0f36c35e7 100644
--- a/src/Psysh/DrushCommand.php
+++ b/src/Psysh/DrushCommand.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Contains \Drush\Psysh\DrushCommand.
@@ -22,7 +23,6 @@
  */
 class DrushCommand extends BaseCommand
 {
-
     /**
      * @var \Symfony\Component\Console\Command\Command
      */
diff --git a/src/Psysh/DrushHelpCommand.php b/src/Psysh/DrushHelpCommand.php
index 11653523e0..8510daff02 100644
--- a/src/Psysh/DrushHelpCommand.php
+++ b/src/Psysh/DrushHelpCommand.php
@@ -23,7 +23,6 @@
  */
 class DrushHelpCommand extends BaseCommand
 {
-
     /**
      * Label for PsySH commands.
      */
diff --git a/src/Psysh/Shell.php b/src/Psysh/Shell.php
index 9924dbb737..a40f280a82 100644
--- a/src/Psysh/Shell.php
+++ b/src/Psysh/Shell.php
@@ -12,7 +12,6 @@
 
 class Shell extends BaseShell
 {
-
     /**
      * Get a command (if one exists) for the current input string.
      *
diff --git a/src/Runtime/DependencyInjection.php b/src/Runtime/DependencyInjection.php
index f90d0d1e23..298a25d300 100644
--- a/src/Runtime/DependencyInjection.php
+++ b/src/Runtime/DependencyInjection.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Runtime;
 
 use League\Container\Container;
diff --git a/src/Runtime/ErrorHandler.php b/src/Runtime/ErrorHandler.php
index c83937bd85..9b371e9aca 100644
--- a/src/Runtime/ErrorHandler.php
+++ b/src/Runtime/ErrorHandler.php
@@ -1,10 +1,6 @@
 <?php
-namespace Drush\Runtime;
 
-/**
- * @file
- * Drush's error handler
- */
+namespace Drush\Runtime;
 
 use Drush\Drush;
 use Psr\Log\LoggerAwareInterface;
diff --git a/src/Runtime/HandlerInterface.php b/src/Runtime/HandlerInterface.php
index 4da4c96ed6..d4d1696694 100644
--- a/src/Runtime/HandlerInterface.php
+++ b/src/Runtime/HandlerInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Runtime;
 
 /**
diff --git a/src/Runtime/Runtime.php b/src/Runtime/Runtime.php
index 47d61996c4..438c8e065b 100644
--- a/src/Runtime/Runtime.php
+++ b/src/Runtime/Runtime.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Runtime;
 
 use Symfony\Component\Console\Output\ConsoleOutput;
diff --git a/src/Runtime/ShutdownHandler.php b/src/Runtime/ShutdownHandler.php
index b85f426b3b..ef77e9a584 100644
--- a/src/Runtime/ShutdownHandler.php
+++ b/src/Runtime/ShutdownHandler.php
@@ -1,10 +1,6 @@
 <?php
-namespace Drush\Runtime;
 
-/**
- * @file
- * Drush's error handler
- */
+namespace Drush\Runtime;
 
 use Drush\Commands\DrushCommands;
 use Drush\Drush;
diff --git a/src/SiteAlias/HostPath.php b/src/SiteAlias/HostPath.php
index 4fc895446c..f8fd452912 100644
--- a/src/SiteAlias/HostPath.php
+++ b/src/SiteAlias/HostPath.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\SiteAlias;
 
 /**
diff --git a/src/SiteAlias/LegacyAliasConverter.php b/src/SiteAlias/LegacyAliasConverter.php
index 9e3280a718..df324af797 100644
--- a/src/SiteAlias/LegacyAliasConverter.php
+++ b/src/SiteAlias/LegacyAliasConverter.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\SiteAlias;
 
 use Symfony\Component\Yaml\Yaml;
diff --git a/src/SiteAlias/ProcessManager.php b/src/SiteAlias/ProcessManager.php
index 4709307938..0b90d09f2a 100644
--- a/src/SiteAlias/ProcessManager.php
+++ b/src/SiteAlias/ProcessManager.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\SiteAlias;
 
 use Consolidation\SiteAlias\SiteAliasInterface;
diff --git a/src/SiteAlias/SiteAliasFileLoader.php b/src/SiteAlias/SiteAliasFileLoader.php
index dc6b617f11..fb6824aadc 100644
--- a/src/SiteAlias/SiteAliasFileLoader.php
+++ b/src/SiteAlias/SiteAliasFileLoader.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\SiteAlias;
 
 use Drush\SiteAlias\Util\InternalYamlDataFileLoader;
diff --git a/src/SiteAlias/SiteAliasManagerAwareInterface.php b/src/SiteAlias/SiteAliasManagerAwareInterface.php
index dafb14e5b0..ad55da0d9d 100644
--- a/src/SiteAlias/SiteAliasManagerAwareInterface.php
+++ b/src/SiteAlias/SiteAliasManagerAwareInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\SiteAlias;
 
 /**
diff --git a/src/SiteAlias/SiteAliasName.php b/src/SiteAlias/SiteAliasName.php
index f936c97a58..87fe56010a 100644
--- a/src/SiteAlias/SiteAliasName.php
+++ b/src/SiteAlias/SiteAliasName.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\SiteAlias;
 
 /**
diff --git a/src/SiteAlias/SiteSpecParser.php b/src/SiteAlias/SiteSpecParser.php
index 896224fccd..7d4f6763fa 100644
--- a/src/SiteAlias/SiteSpecParser.php
+++ b/src/SiteAlias/SiteSpecParser.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\SiteAlias;
 
 /**
diff --git a/src/SiteAlias/Util/InternalYamlDataFileLoader.php b/src/SiteAlias/Util/InternalYamlDataFileLoader.php
index 59096b5396..a660568aa0 100644
--- a/src/SiteAlias/Util/InternalYamlDataFileLoader.php
+++ b/src/SiteAlias/Util/InternalYamlDataFileLoader.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\SiteAlias\Util;
 
 use Symfony\Component\Yaml\Yaml;
diff --git a/src/Sql/SqlBase.php b/src/Sql/SqlBase.php
index ff8100e6aa..79a9866e4c 100644
--- a/src/Sql/SqlBase.php
+++ b/src/Sql/SqlBase.php
@@ -15,7 +15,6 @@
 
 abstract class SqlBase implements ConfigAwareInterface
 {
-
     use SqlTableSelectionTrait;
     use ConfigAwareTrait;
 
@@ -105,7 +104,7 @@ public static function create(array $options = []): SqlBase
     public static function getInstance($db_spec, $options): ?self
     {
         $driver = $db_spec['driver'];
-        $class_name = 'Drush\Sql\Sql'. ucfirst($driver);
+        $class_name = 'Drush\Sql\Sql' . ucfirst($driver);
         if (class_exists($class_name)) {
             $instance = new $class_name($db_spec, $options);
             // Inject config
@@ -325,7 +324,7 @@ public function alwaysQuery(string $query, $input_file = null, ?string $result_f
         $exec = implode(' ', $parts);
 
         if ($result_file) {
-            $exec .= ' > '. Escape::shellArg($result_file);
+            $exec .= ' > ' . Escape::shellArg($result_file);
         }
 
         // In --verbose mode, Process will show the call to mysql/psql/sqlite,
@@ -398,7 +397,7 @@ public function drop(array $tables): ?bool
     {
         $return = true;
         if ($tables) {
-            $sql = 'DROP TABLE '. implode(', ', $tables);
+            $sql = 'DROP TABLE ' . implode(', ', $tables);
             $return = $this->query($sql);
         }
         return $return;
diff --git a/src/Sql/SqlMysql.php b/src/Sql/SqlMysql.php
index 61af74a8a9..1cb6964be1 100644
--- a/src/Sql/SqlMysql.php
+++ b/src/Sql/SqlMysql.php
@@ -6,7 +6,6 @@
 
 class SqlMysql extends SqlBase
 {
-
     public $queryExtra = '-A';
 
     public function command(): string
@@ -186,7 +185,7 @@ public function dumpCmd($table_selection): string
                 $ignores[] = '--ignore-table=' . $dbSpec['database'] . '.' . $table;
                 $parens = true;
             }
-            $exec .= ' '. implode(' ', $ignores);
+            $exec .= ' ' . implode(' ', $ignores);
 
             // Run mysqldump again and append output if we need some structure only tables.
             if (!empty($structure_tables)) {
diff --git a/src/Sql/SqlPgsql.php b/src/Sql/SqlPgsql.php
index 70ec64b793..89d7c6059f 100644
--- a/src/Sql/SqlPgsql.php
+++ b/src/Sql/SqlPgsql.php
@@ -8,7 +8,6 @@
 
 class SqlPgsql extends SqlBase
 {
-
     public $queryExtra = "--no-align --field-separator=\"\t\" --pset tuples_only=on";
 
     public $queryFile = "--file";
@@ -158,7 +157,7 @@ public function dumpCmd($table_selection): string
             foreach ($skip_tables as $table) {
                 $ignores[] = "--exclude-table=$table";
             }
-            $exec .= ' '. implode(' ', $ignores);
+            $exec .= ' ' . implode(' ', $ignores);
             // Run pg_dump again and append output if we need some structure only tables.
             if (!empty($structure_tables)) {
                 $parens = true;
diff --git a/src/Sql/SqlTableSelectionTrait.php b/src/Sql/SqlTableSelectionTrait.php
index 19c1224c70..2354ecc889 100644
--- a/src/Sql/SqlTableSelectionTrait.php
+++ b/src/Sql/SqlTableSelectionTrait.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Sql;
 
 use Drush\Utils\StringUtils;
@@ -10,7 +11,6 @@
  */
 trait SqlTableSelectionTrait
 {
-
     /**
      * Given a list of all tables, expand the convert the wildcards in the
      * option-provided lists into a list of actual table names.
diff --git a/src/Symfony/DrushArgvInput.php b/src/Symfony/DrushArgvInput.php
index d52deebdcc..e13c01f56a 100644
--- a/src/Symfony/DrushArgvInput.php
+++ b/src/Symfony/DrushArgvInput.php
@@ -287,7 +287,7 @@ public function hasParameterOption($values, $onlyParams = false): bool
                 return false;
             }
             foreach ($values as $value) {
-                if ($token === $value || 0 === strpos($token, $value.'=')) {
+                if ($token === $value || 0 === strpos($token, $value . '=')) {
                     return true;
                 }
 
@@ -324,7 +324,7 @@ public function getParameterOption($values, $default = false, $onlyParams = fals
             }
 
             foreach ($values as $value) {
-                if ($token === $value || 0 === strpos($token, $value.'=')) {
+                if ($token === $value || 0 === strpos($token, $value . '=')) {
                     if (false !== $pos = strpos($token, '=')) {
                         return substr($token, $pos + 1);
                     }
@@ -346,7 +346,7 @@ public function __toString()
     {
         $tokens = array_map(function ($token) {
             if (preg_match('{^(-[^=]+=)(.+)}', $token, $match)) {
-                return $match[1].$this->escapeToken($match[2]);
+                return $match[1] . $this->escapeToken($match[2]);
             }
 
             if ($token && '-' !== $token[0]) {
diff --git a/src/Symfony/DrushStyleInjector.php b/src/Symfony/DrushStyleInjector.php
index 41c7f3fcab..2f000eef8c 100644
--- a/src/Symfony/DrushStyleInjector.php
+++ b/src/Symfony/DrushStyleInjector.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Symfony;
 
 use Consolidation\AnnotatedCommand\CommandData;
diff --git a/src/Symfony/LessStrictArgvInput.php b/src/Symfony/LessStrictArgvInput.php
index dd6d77cdcc..0104fc916e 100644
--- a/src/Symfony/LessStrictArgvInput.php
+++ b/src/Symfony/LessStrictArgvInput.php
@@ -3,7 +3,6 @@
 namespace Drush\Symfony;
 
 use Symfony\Component\Console\Input\ArgvInput;
-
 use Symfony\Component\Console\Exception\RuntimeException;
 
 /**
@@ -293,7 +292,7 @@ public function hasParameterOption($values, $onlyParams = false): bool
                 return false;
             }
             foreach ($values as $value) {
-                if ($token === $value || 0 === strpos($token, $value.'=')) {
+                if ($token === $value || 0 === strpos($token, $value . '=')) {
                     return true;
                 }
             }
@@ -317,7 +316,7 @@ public function getParameterOption($values, $default = false, $onlyParams = fals
             }
 
             foreach ($values as $value) {
-                if ($token === $value || 0 === strpos($token, $value.'=')) {
+                if ($token === $value || 0 === strpos($token, $value . '=')) {
                     if (false !== $pos = strpos($token, '=')) {
                         return substr($token, $pos + 1);
                     }
@@ -339,7 +338,7 @@ public function __toString()
     {
         $tokens = array_map(function ($token) {
             if (preg_match('{^(-[^=]+=)(.+)}', $token, $match)) {
-                return $match[1].$this->escapeToken($match[2]);
+                return $match[1] . $this->escapeToken($match[2]);
             }
 
             if ($token && $token[0] !== '-') {
diff --git a/src/TestTraits/CliTestTrait.php b/src/TestTraits/CliTestTrait.php
index 95e703afb5..dc3db23d57 100644
--- a/src/TestTraits/CliTestTrait.php
+++ b/src/TestTraits/CliTestTrait.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\TestTraits;
 
 use Symfony\Component\Process\Process;
diff --git a/src/TestTraits/DrushTestTrait.php b/src/TestTraits/DrushTestTrait.php
index 2a1e565650..32008f6a89 100644
--- a/src/TestTraits/DrushTestTrait.php
+++ b/src/TestTraits/DrushTestTrait.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\TestTraits;
 
 /**
diff --git a/src/TestTraits/OutputUtilsTrait.php b/src/TestTraits/OutputUtilsTrait.php
index c5b58c4386..1d7f51a6e9 100644
--- a/src/TestTraits/OutputUtilsTrait.php
+++ b/src/TestTraits/OutputUtilsTrait.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\TestTraits;
 
 /**
diff --git a/src/Utils/FsUtils.php b/src/Utils/FsUtils.php
index 794895a9b1..de5d460e7c 100644
--- a/src/Utils/FsUtils.php
+++ b/src/Utils/FsUtils.php
@@ -10,7 +10,6 @@
 
 class FsUtils
 {
-
     /**
      * Decide where our backup directory should go
      *
diff --git a/src/Utils/StringUtils.php b/src/Utils/StringUtils.php
index aa35a78f67..13079b8d81 100644
--- a/src/Utils/StringUtils.php
+++ b/src/Utils/StringUtils.php
@@ -4,7 +4,6 @@
 
 class StringUtils
 {
-
     /**
      * Convert a csv string, or an array of items which
      * may contain csv strings, into an array of items.
diff --git a/tests/fixtures/modules/woot/src/Commands/AnnotatedGreetCommand.php b/tests/fixtures/modules/woot/src/Commands/AnnotatedGreetCommand.php
index 1a42b81341..2502ebe491 100644
--- a/tests/fixtures/modules/woot/src/Commands/AnnotatedGreetCommand.php
+++ b/tests/fixtures/modules/woot/src/Commands/AnnotatedGreetCommand.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drupal\woot\Commands;
 
 use Consolidation\AnnotatedCommand\AnnotatedCommand;
@@ -27,7 +28,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $name = $input->getArgument('name');
         if ($name) {
-            $text = 'Hello '.$name;
+            $text = 'Hello ' . $name;
         } else {
             $text = 'Hello';
         }
diff --git a/tests/fixtures/modules/woot/src/Commands/GreetCommand.php b/tests/fixtures/modules/woot/src/Commands/GreetCommand.php
index cd52c0ce24..39fca6af0e 100644
--- a/tests/fixtures/modules/woot/src/Commands/GreetCommand.php
+++ b/tests/fixtures/modules/woot/src/Commands/GreetCommand.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drupal\woot\Commands;
 
 use Symfony\Component\Console\Command\Command;
@@ -38,7 +39,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $name = $input->getArgument('name');
         if ($name) {
-            $text = 'Hello '.$name;
+            $text = 'Hello ' . $name;
         } else {
             $text = 'Hello';
         }
diff --git a/tests/fixtures/modules/woot/src/Commands/WootCommands.php b/tests/fixtures/modules/woot/src/Commands/WootCommands.php
index 9f8596eb22..feed2432d8 100644
--- a/tests/fixtures/modules/woot/src/Commands/WootCommands.php
+++ b/tests/fixtures/modules/woot/src/Commands/WootCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drupal\woot\Commands;
 
 use Consolidation\OutputFormatters\StructuredData\RowsOfFields;
diff --git a/tests/fixtures/modules/woot/src/DependingService.php b/tests/fixtures/modules/woot/src/DependingService.php
index 9893656755..6028dff04c 100644
--- a/tests/fixtures/modules/woot/src/DependingService.php
+++ b/tests/fixtures/modules/woot/src/DependingService.php
@@ -21,7 +21,6 @@
  */
 class DependingService
 {
-
     /**
      * @var \Drupal\drush_empty_module\MuchServiceManyWow
      */
diff --git a/tests/fixtures/modules/woot/src/EventSubscriber/ConfigSubscriber.php b/tests/fixtures/modules/woot/src/EventSubscriber/ConfigSubscriber.php
index 97fcc0e751..f97bc396f2 100644
--- a/tests/fixtures/modules/woot/src/EventSubscriber/ConfigSubscriber.php
+++ b/tests/fixtures/modules/woot/src/EventSubscriber/ConfigSubscriber.php
@@ -11,7 +11,6 @@
  */
 class ConfigSubscriber extends ConfigImportValidateEventSubscriberBase
 {
-
   /**
    * {@inheritdoc}
    */
diff --git a/tests/fixtures/modules/woot/src/Plugin/QueueWorker/WootCustomException.php b/tests/fixtures/modules/woot/src/Plugin/QueueWorker/WootCustomException.php
index 122cc18ad4..fd890e9d13 100644
--- a/tests/fixtures/modules/woot/src/Plugin/QueueWorker/WootCustomException.php
+++ b/tests/fixtures/modules/woot/src/Plugin/QueueWorker/WootCustomException.php
@@ -15,7 +15,6 @@
  */
 class WootCustomException extends QueueWorkerBase
 {
-
   /**
    * {@inheritdoc}
    */
diff --git a/tests/fixtures/modules/woot/src/Plugin/QueueWorker/WootRequeueException.php b/tests/fixtures/modules/woot/src/Plugin/QueueWorker/WootRequeueException.php
index 5ee43fe910..19da1b4dc7 100644
--- a/tests/fixtures/modules/woot/src/Plugin/QueueWorker/WootRequeueException.php
+++ b/tests/fixtures/modules/woot/src/Plugin/QueueWorker/WootRequeueException.php
@@ -16,7 +16,6 @@
  */
 class WootRequeueException extends QueueWorkerBase
 {
-
   /**
    * {@inheritdoc}
    */
diff --git a/tests/fixtures/sitealiases/legacy/pantheon.aliases.drushrc.php b/tests/fixtures/sitealiases/legacy/pantheon.aliases.drushrc.php
index 145ec405b0..52c2654687 100644
--- a/tests/fixtures/sitealiases/legacy/pantheon.aliases.drushrc.php
+++ b/tests/fixtures/sitealiases/legacy/pantheon.aliases.drushrc.php
@@ -1,4 +1,5 @@
 <?php
+
   /**
    * Pantheon drush alias file, to be placed in your ~/.drush directory or the aliases
    * directory of your local Drush home. Once it's in place, clear drush cache:
diff --git a/tests/functional/BatchTest.php b/tests/functional/BatchTest.php
index f122411585..a546a9d729 100644
--- a/tests/functional/BatchTest.php
+++ b/tests/functional/BatchTest.php
@@ -9,7 +9,6 @@
  */
 class BatchTest extends CommandUnishTestCase
 {
-
     public function testBatch()
     {
         $this->setUpDrupal(1, true);
diff --git a/tests/functional/Commands/TestFixtureCommands.php b/tests/functional/Commands/TestFixtureCommands.php
index e35819196f..50a9ec506b 100644
--- a/tests/functional/Commands/TestFixtureCommands.php
+++ b/tests/functional/Commands/TestFixtureCommands.php
@@ -4,6 +4,7 @@
  * @file
  *   Commands which are useful for unit tests.
  */
+
 namespace Drush\Commands;
 
 use Drupal\Core\DrupalKernel;
@@ -14,7 +15,6 @@
 
 class TestFixtureCommands extends DrushCommands implements AutoloaderAwareInterface
 {
-
     use AutoloaderAwareTrait;
 
   // Obsolete:
@@ -126,7 +126,7 @@ protected function loadDrupalAutoloader($drupal_root)
     {
         static $autoloader = false;
 
-        $autoloadFilePath = $drupal_root .'/autoload.php';
+        $autoloadFilePath = $drupal_root . '/autoload.php';
         if (!$autoloader && file_exists($autoloadFilePath)) {
             $autoloader = require $autoloadFilePath;
         }
diff --git a/tests/functional/ConfigPullTest.php b/tests/functional/ConfigPullTest.php
index efe76609bd..711e70c3e5 100644
--- a/tests/functional/ConfigPullTest.php
+++ b/tests/functional/ConfigPullTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Unish;
 
 use Webmozart\PathUtil\Path;
@@ -11,7 +12,6 @@
  */
 class ConfigPullTest extends CommandUnishTestCase
 {
-
     public function setup(): void
     {
         $this->setUpDrupal(2, true);
diff --git a/tests/functional/ConfigTest.php b/tests/functional/ConfigTest.php
index 690a9d3dbe..36520171fe 100644
--- a/tests/functional/ConfigTest.php
+++ b/tests/functional/ConfigTest.php
@@ -118,7 +118,7 @@ public function testConfigExportImportStatusExistingConfig()
         $contents = preg_replace('/front: .*/', 'front: unish partial', $contents);
         $partial_path = self::getSandbox() . '/partial';
         $this->mkdir($partial_path);
-        $contents = file_put_contents($partial_path. '/system.site.yml', $contents);
+        $contents = file_put_contents($partial_path . '/system.site.yml', $contents);
         $this->drush('config-import', [], ['partial' => null, 'source' => $partial_path]);
         $this->drush('config-get', ['system.site', 'page'], ['format' => 'json']);
         $page = $this->getOutputFromJSON('system.site:page');
@@ -186,6 +186,6 @@ class: Drupal\woot\DependingService
     protected function getConfigSyncDir()
     {
         $this->drush('core:status', [], ['format' => 'json', 'fields' => 'config-sync']);
-        return $this->webroot().'/'.$this->getOutputFromJSON('config-sync');
+        return $this->webroot() . '/' . $this->getOutputFromJSON('config-sync');
     }
 }
diff --git a/tests/functional/CoreTest.php b/tests/functional/CoreTest.php
index db825c9ed5..80d5f034e8 100644
--- a/tests/functional/CoreTest.php
+++ b/tests/functional/CoreTest.php
@@ -47,7 +47,8 @@ public function testOptionsUri()
         'format' => 'json',
         'uri' => 'OMIT', // A special value which causes --uri to not be specified.
         ];
-        foreach ([
+        foreach (
+            [
                    'test.uri' => ['http://test.uri', 'sites/dev'],
                    'test.uri/' => ['http://test.uri/', 'sites/dev'],
                    'test.uri/subpath' => ['http://test.uri/subpath', 'sites/stage'],
@@ -60,7 +61,8 @@ public function testOptionsUri()
                    'https://test.uri/' => ['https://test.uri/', 'sites/dev'],
                    'https://test.uri/subpath' => ['https://test.uri/subpath', 'sites/stage'],
                    'https://test.uri/subpath/' => ['https://test.uri/subpath/', 'sites/stage'],
-                 ] as $test_uri => $expected) {
+                 ] as $test_uri => $expected
+        ) {
             // Put a yml file in the drush folder.
             $config_options = [
               'options' => [
@@ -84,7 +86,8 @@ public function testOptionsUriRequestUrl()
         $command_options = [
         'uri' => 'OMIT', // A special value which causes --uri to not be specified.
         ];
-        foreach ([
+        foreach (
+            [
                    'test.uri' => 'http://test.uri',
                    'test.uri/' => 'http://test.uri',
                    'test.uri/subpath' => 'http://test.uri/subpath',
@@ -97,7 +100,8 @@ public function testOptionsUriRequestUrl()
                    'https://test.uri/' => 'https://test.uri',
                    'https://test.uri/subpath' => 'https://test.uri/subpath',
                    'https://test.uri/subpath/' => 'https://test.uri/subpath',
-                 ] as $test_uri => $expected) {
+                 ] as $test_uri => $expected
+        ) {
             // Put a yml file in the drush folder.
             $config_options = [
               'options' => [
@@ -109,7 +113,7 @@ public function testOptionsUriRequestUrl()
             unlink($drush_config_file);
             $output = $this->getOutputRaw();
             // Include the test URI, for some context in errors.
-            $i=10;
+            $i = 10;
             $this->assertEquals([$test_uri => $expected], [$test_uri => trim($output)]);
         }
     }
diff --git a/tests/functional/FieldTest.php b/tests/functional/FieldTest.php
index 3274839d6f..80bbc45df3 100644
--- a/tests/functional/FieldTest.php
+++ b/tests/functional/FieldTest.php
@@ -10,7 +10,6 @@
  */
 class FieldTest extends CommandUnishTestCase
 {
-
     public function setup(): void
     {
         parent::setup();
diff --git a/tests/functional/PmEnDisUnListInfoTest.php b/tests/functional/PmEnDisUnListInfoTest.php
index 59094c37b9..3f772a28ca 100644
--- a/tests/functional/PmEnDisUnListInfoTest.php
+++ b/tests/functional/PmEnDisUnListInfoTest.php
@@ -15,7 +15,6 @@
  */
 class EnDisUnListInfoTest extends CommandUnishTestCase
 {
-
     public function testEnDisUnList()
     {
         $sites = $this->setUpDrupal(1, true);
diff --git a/tests/functional/PmEnLocaleImportTest.php b/tests/functional/PmEnLocaleImportTest.php
index 4d17fa15fb..64c9d38e53 100644
--- a/tests/functional/PmEnLocaleImportTest.php
+++ b/tests/functional/PmEnLocaleImportTest.php
@@ -13,7 +13,6 @@
  */
 class PmEnLocaleImportTest extends CommandUnishTestCase
 {
-
     public function testBatchImportTranslations()
     {
         $info_yml = Path::join($this->webroot(), 'modules/unish/drush_empty_module/drush_empty_module.info.yml');
diff --git a/tests/functional/RedispatchTest.php b/tests/functional/RedispatchTest.php
index 6b2f22572a..e2ff0796ea 100644
--- a/tests/functional/RedispatchTest.php
+++ b/tests/functional/RedispatchTest.php
@@ -9,7 +9,6 @@
  */
 class RedispatchTest extends CommandUnishTestCase
 {
-
     /**
      * Covers the following origin responsibilities.
      *  - A remote host is recognized in site specification.
diff --git a/tests/functional/RsyncTest.php b/tests/functional/RsyncTest.php
index a3ebe2e0ba..abdce97945 100644
--- a/tests/functional/RsyncTest.php
+++ b/tests/functional/RsyncTest.php
@@ -11,7 +11,6 @@
  */
 class RsyncTest extends CommandUnishTestCase
 {
-
     public function setup(): void
     {
         if ($this->isWindows()) {
diff --git a/tests/functional/SiteInstallTest.php b/tests/functional/SiteInstallTest.php
index c7b6ed8847..16894fd727 100644
--- a/tests/functional/SiteInstallTest.php
+++ b/tests/functional/SiteInstallTest.php
@@ -8,7 +8,6 @@
  */
 class SiteInstallTest extends CommandUnishTestCase
 {
-
     /**
      * Test functionality of site set.
      */
diff --git a/tests/functional/SiteSetTest.php b/tests/functional/SiteSetTest.php
index 0e31941557..6a44f1ee3a 100644
--- a/tests/functional/SiteSetTest.php
+++ b/tests/functional/SiteSetTest.php
@@ -8,7 +8,6 @@
  */
 class SiteSetTest extends CommandUnishTestCase
 {
-
     /**
      * Test functionality of site set.
      */
diff --git a/tests/functional/SiteSshTest.php b/tests/functional/SiteSshTest.php
index 8e16106bc3..89ef906bc6 100644
--- a/tests/functional/SiteSshTest.php
+++ b/tests/functional/SiteSshTest.php
@@ -10,7 +10,6 @@
  */
 class SiteSshTest extends CommandUnishTestCase
 {
-
     /**
      * Test drush ssh --simulate. No additional bash passed.
      */
diff --git a/tests/functional/SqlConnectTest.php b/tests/functional/SqlConnectTest.php
index e58fe58d59..1f23fc8111 100644
--- a/tests/functional/SqlConnectTest.php
+++ b/tests/functional/SqlConnectTest.php
@@ -12,7 +12,6 @@
  */
 class SqlConnectTest extends CommandUnishTestCase
 {
-
     public function testSqlConnect()
     {
         $this->setUpDrupal(1, true);
diff --git a/tests/functional/SqlDumpTest.php b/tests/functional/SqlDumpTest.php
index 0cfe24b743..475caadda6 100644
--- a/tests/functional/SqlDumpTest.php
+++ b/tests/functional/SqlDumpTest.php
@@ -13,7 +13,6 @@
  */
 class SqlDumpTest extends CommandUnishTestCase
 {
-
   /**
    * Test that a dump file is created successfully.
    */
diff --git a/tests/functional/SqlSyncTest.php b/tests/functional/SqlSyncTest.php
index c33c4afcdb..6a0ca77aee 100644
--- a/tests/functional/SqlSyncTest.php
+++ b/tests/functional/SqlSyncTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Unish;
 
 /**
@@ -8,7 +9,6 @@
  */
 class SqlSyncTest extends CommandUnishTestCase
 {
-
     public function testSimulatedSqlSync()
     {
         if ($this->isWindows()) {
diff --git a/tests/functional/UserTest.php b/tests/functional/UserTest.php
index 3871965fe2..8007394211 100644
--- a/tests/functional/UserTest.php
+++ b/tests/functional/UserTest.php
@@ -10,7 +10,6 @@
  */
 class UserTest extends CommandUnishTestCase
 {
-
     const NAME = 'example';
     const MAIL = 'example@example.com';
 
diff --git a/tests/functional/WatchdogTailTest.php b/tests/functional/WatchdogTailTest.php
index 3b973f3039..520058c037 100644
--- a/tests/functional/WatchdogTailTest.php
+++ b/tests/functional/WatchdogTailTest.php
@@ -11,7 +11,6 @@
  */
 class WatchdogTailTest extends CommandUnishTestCase
 {
-
     /**
      * Test that watchdog tail works.
      */
diff --git a/tests/integration/CacheCommandTest.php b/tests/integration/CacheCommandTest.php
index 7bebfd2573..51bf9c772d 100644
--- a/tests/integration/CacheCommandTest.php
+++ b/tests/integration/CacheCommandTest.php
@@ -39,7 +39,7 @@ public function testCacheSet()
 
         // Test cache-set using all arguments and many options.
         $expected = ['key' => 'value'];
-        $stdin = json_encode(['data'=> $expected]);
+        $stdin = json_encode(['data' => $expected]);
         $bin = 'default';
 
         $this->drush('cache-set', ['my_cache_id', '-', $bin, 'CACHE_PERMANENT'], ['input-format' => 'json', 'cache-get' => true], self::EXIT_SUCCESS, $stdin);
diff --git a/tests/integration/CoreTest.php b/tests/integration/CoreTest.php
index 9ac99f00d3..184cb81113 100644
--- a/tests/integration/CoreTest.php
+++ b/tests/integration/CoreTest.php
@@ -71,7 +71,7 @@ public function testRoute()
         $json = $this->getOutputFromJSON();
         $this->assertArrayHasKey('user.login', $json);
         $this->assertSame('/user/login', $json['user.login']);
-        $this->drush('route', [], ['path' =>'/user/login', 'format' => 'json']);
+        $this->drush('route', [], ['path' => '/user/login', 'format' => 'json']);
         $json = $this->getOutputFromJSON();
         $this->assertSame('/user/login', $json['path']);
         $this->assertSame('user.login', $json['name']);
@@ -79,7 +79,7 @@ public function testRoute()
         $this->assertSame("FALSE", $json['requirements']['_user_is_logged_in']);
         $this->assertSame('access_check.user.login_status', $json['options']['_access_checks'][0]);
 
-        $this->drush('route', [], ['name' =>'user.login', 'format' => 'json']);
+        $this->drush('route', [], ['name' => 'user.login', 'format' => 'json']);
         $json = $this->getOutputFromJSON();
         $this->assertSame('/user/login', $json['path']);
     }
diff --git a/tests/integration/DeployTest.php b/tests/integration/DeployTest.php
index 6e4674a64f..467c6aaa47 100644
--- a/tests/integration/DeployTest.php
+++ b/tests/integration/DeployTest.php
@@ -7,7 +7,6 @@
  */
 class DeployTest extends UnishIntegrationTestCase
 {
-
     /**
      * A simple test since all the sub-commands are tested elsewhere.
      */
@@ -15,7 +14,7 @@ public function testDeploy()
     {
         // Prep a config directory that will be imported later.
         $this->drush('config:export');
-        
+
         $this->drush('deploy');
         $expecteds = ["Database updates start.", 'Config import start.', 'Deploy hook start.', 'Cache rebuild start.'];
         foreach ($expecteds as $expected) {
diff --git a/tests/integration/SecurityUpdatesTest.php b/tests/integration/SecurityUpdatesTest.php
index 0897fa69dd..697de3a010 100644
--- a/tests/integration/SecurityUpdatesTest.php
+++ b/tests/integration/SecurityUpdatesTest.php
@@ -9,7 +9,6 @@
  */
 class SecurityUpdatesTest extends UnishIntegrationTestCase
 {
-
   /**
    * Test that insecure Drupal packages are correctly identified.
    */
diff --git a/tests/integration/SiteAliasConvertTest.php b/tests/integration/SiteAliasConvertTest.php
index 7f989da093..3cb579a269 100644
--- a/tests/integration/SiteAliasConvertTest.php
+++ b/tests/integration/SiteAliasConvertTest.php
@@ -10,7 +10,6 @@
  */
 class SiteAliasConvertTest extends UnishIntegrationTestCase
 {
-
   /**
    * Test functionality of site:alias-convert.
    */
diff --git a/tests/integration/SqlCliTest.php b/tests/integration/SqlCliTest.php
index a3da378d08..8ac518eda9 100644
--- a/tests/integration/SqlCliTest.php
+++ b/tests/integration/SqlCliTest.php
@@ -16,7 +16,6 @@
  */
 class SqlCliTest extends UnishIntegrationTestCase
 {
-
     public function testSqlCli()
     {
         if ($this->isWindows()) {
diff --git a/tests/integration/WatchdogTest.php b/tests/integration/WatchdogTest.php
index f9a90b3f53..d6751d07ed 100644
--- a/tests/integration/WatchdogTest.php
+++ b/tests/integration/WatchdogTest.php
@@ -7,7 +7,6 @@
  */
 class WatchdogTest extends UnishIntegrationTestCase
 {
-
     public function testWatchdog()
     {
         $this->drush('pm-enable', ['dblog']);
diff --git a/tests/integration/resources/Commands/ExampleAttributesCommands.php b/tests/integration/resources/Commands/ExampleAttributesCommands.php
index 90631b2561..6bd7528fc6 100644
--- a/tests/integration/resources/Commands/ExampleAttributesCommands.php
+++ b/tests/integration/resources/Commands/ExampleAttributesCommands.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Commands;
 
 use Consolidation\AnnotatedCommand\Hooks\HookManager;
diff --git a/tests/unish/UnishIntegrationTestCase.php b/tests/unish/UnishIntegrationTestCase.php
index 5caa87d06c..7d7970f6ca 100644
--- a/tests/unish/UnishIntegrationTestCase.php
+++ b/tests/unish/UnishIntegrationTestCase.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Unish;
 
 use Drush\Config\Environment;
diff --git a/tests/unish/UnishTestCase.php b/tests/unish/UnishTestCase.php
index c8ca0568a7..2ce0861507 100644
--- a/tests/unish/UnishTestCase.php
+++ b/tests/unish/UnishTestCase.php
@@ -741,7 +741,7 @@ public static function setEnv(array $vars)
         foreach ($vars as $k => $v) {
             putenv($k . '=' . $v);
             // Value must be a string. See \Symfony\Component\Process\Process::getDefaultEnv.
-            $_SERVER[$k]= (string) $v;
+            $_SERVER[$k] = (string) $v;
         }
     }
 
diff --git a/tests/unish/Utils/FSUtils.php b/tests/unish/Utils/FSUtils.php
index 4cef991cdd..eac6df48d3 100644
--- a/tests/unish/Utils/FSUtils.php
+++ b/tests/unish/Utils/FSUtils.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Unish\Utils;
 
 // We want to avoid using symfony/filesystem in the isolation tests.
diff --git a/tests/unish/Utils/Fixtures.php b/tests/unish/Utils/Fixtures.php
index f26534f18a..b2010f3711 100644
--- a/tests/unish/Utils/Fixtures.php
+++ b/tests/unish/Utils/Fixtures.php
@@ -1,7 +1,8 @@
 <?php
+
 namespace Unish\Utils;
 
-use \Drush\Config\Environment;
+use Drush\Config\Environment;
 use Webmozart\PathUtil\Path;
 
 trait Fixtures
diff --git a/tests/unish/Utils/FunctionUtils.php b/tests/unish/Utils/FunctionUtils.php
index fb37b7852d..027de89b4f 100644
--- a/tests/unish/Utils/FunctionUtils.php
+++ b/tests/unish/Utils/FunctionUtils.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Unish\Utils;
 
 trait FunctionUtils
diff --git a/tests/unit/ArgsPreprocessorTest.php b/tests/unit/ArgsPreprocessorTest.php
index c12e8331bb..f4247d2957 100644
--- a/tests/unit/ArgsPreprocessorTest.php
+++ b/tests/unit/ArgsPreprocessorTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Preflight;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/unit/ArgsRemapperTest.php b/tests/unit/ArgsRemapperTest.php
index dc9c19a825..3949be2a9f 100644
--- a/tests/unit/ArgsRemapperTest.php
+++ b/tests/unit/ArgsRemapperTest.php
@@ -2,7 +2,7 @@
 
 namespace Unish;
 
-use \Drush\Preflight\ArgsRemapper;
+use Drush\Preflight\ArgsRemapper;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -12,7 +12,6 @@
  */
 class ArgsRemapperTest extends TestCase
 {
-
     /**
      * @covers argsRemapper::ArgsRemapper
      * @dataProvider argsProvider
diff --git a/tests/unit/ConfigLocatorTest.php b/tests/unit/ConfigLocatorTest.php
index 60acda68d6..a055cee60d 100644
--- a/tests/unit/ConfigLocatorTest.php
+++ b/tests/unit/ConfigLocatorTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Config;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/unit/EnvironmentTest.php b/tests/unit/EnvironmentTest.php
index eb55fb4554..f3ca4b3135 100644
--- a/tests/unit/EnvironmentTest.php
+++ b/tests/unit/EnvironmentTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\Config;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/unit/ExpandWildcardTablesTest.php b/tests/unit/ExpandWildcardTablesTest.php
index 648b5fcbe6..737414c187 100644
--- a/tests/unit/ExpandWildcardTablesTest.php
+++ b/tests/unit/ExpandWildcardTablesTest.php
@@ -2,7 +2,7 @@
 
 namespace Unish;
 
-use \Drush\Sql\SqlTableSelectionTrait;
+use Drush\Sql\SqlTableSelectionTrait;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -13,7 +13,6 @@
   */
 class ExpandWildcardTablesTest extends TestCase
 {
-
     use SqlTableSelectionTrait;
 
   /**
diff --git a/tests/unit/LegacyAliasConverterTest.php b/tests/unit/LegacyAliasConverterTest.php
index df0b29d810..5f42f61e8b 100644
--- a/tests/unit/LegacyAliasConverterTest.php
+++ b/tests/unit/LegacyAliasConverterTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\SiteAlias;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/unit/SiteAliasFileDiscoveryTest.php b/tests/unit/SiteAliasFileDiscoveryTest.php
index 8fdfe5836a..f64a3467bc 100644
--- a/tests/unit/SiteAliasFileDiscoveryTest.php
+++ b/tests/unit/SiteAliasFileDiscoveryTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\SiteAlias;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/unit/SiteAliasFileLoaderTest.php b/tests/unit/SiteAliasFileLoaderTest.php
index f4ce0d1c92..004911a8ab 100644
--- a/tests/unit/SiteAliasFileLoaderTest.php
+++ b/tests/unit/SiteAliasFileLoaderTest.php
@@ -1,8 +1,8 @@
 <?php
+
 namespace Drush\SiteAlias;
 
 use PHPUnit\Framework\TestCase;
-
 use Consolidation\SiteAlias\Util\YamlDataFileLoader;
 use Consolidation\SiteAlias\SiteAlias;
 
diff --git a/tests/unit/SiteAliasNameTest.php b/tests/unit/SiteAliasNameTest.php
index c53e8411a3..a57834a009 100644
--- a/tests/unit/SiteAliasNameTest.php
+++ b/tests/unit/SiteAliasNameTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\SiteAlias;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/unit/SiteSpecParserTest.php b/tests/unit/SiteSpecParserTest.php
index 16f725b10b..eb849a4aa2 100644
--- a/tests/unit/SiteSpecParserTest.php
+++ b/tests/unit/SiteSpecParserTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drush\SiteAlias;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/unit/TestSqlIdMap.php b/tests/unit/TestSqlIdMap.php
index 416bb3d57f..9d72f426d2 100644
--- a/tests/unit/TestSqlIdMap.php
+++ b/tests/unit/TestSqlIdMap.php
@@ -12,7 +12,6 @@
  */
 class TestSqlIdMap extends Sql
 {
-
     public function __construct(Connection $database, array $configuration, $pluginId, $pluginDefinition, MigrationInterface $migration, EventDispatcherInterface $eventDispatcher)
     {
         $this->database = $database;
diff --git a/tests/unit/XhProfTest.php b/tests/unit/XhProfTest.php
index 1eee71ce4a..cd4edea2dd 100644
--- a/tests/unit/XhProfTest.php
+++ b/tests/unit/XhProfTest.php
@@ -13,7 +13,6 @@
  */
 class XhProfTest extends TestCase
 {
-
   /**
    * Test various combinations of XHProf flag options.
    *