diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index 289fad838e..901dceed32 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -13,7 +13,6 @@
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Render\Element;
 
-
 /**
  * Prepares variables for single local task link templates.
  *
diff --git a/core/lib/Drupal/Component/Datetime/DateTimePlus.php b/core/lib/Drupal/Component/Datetime/DateTimePlus.php
index 3495314984..8fc8b601f1 100644
--- a/core/lib/Drupal/Component/Datetime/DateTimePlus.php
+++ b/core/lib/Drupal/Component/Datetime/DateTimePlus.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Component\Datetime;
+
 use Drupal\Component\Utility\ToStringTrait;
 
 /**
diff --git a/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php b/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php
index 4d49d87b4d..0a64724114 100644
--- a/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php
+++ b/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php
@@ -4,7 +4,6 @@
 
 use Drupal\Core\State\StateInterface;
 
-
 /**
  * Optimizes JavaScript assets.
  */
diff --git a/core/lib/Drupal/Core/Cache/BackendChain.php b/core/lib/Drupal/Core/Cache/BackendChain.php
index a8cef19fd5..3b3489af9d 100644
--- a/core/lib/Drupal/Core/Cache/BackendChain.php
+++ b/core/lib/Drupal/Core/Cache/BackendChain.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Core\Cache;
+
 /**
  * Defines a chained cache implementation for combining multiple cache backends.
  *
diff --git a/core/lib/Drupal/Core/Cache/ChainedFastBackendFactory.php b/core/lib/Drupal/Core/Cache/ChainedFastBackendFactory.php
index 3169a3567b..1016e5a3ec 100644
--- a/core/lib/Drupal/Core/Cache/ChainedFastBackendFactory.php
+++ b/core/lib/Drupal/Core/Cache/ChainedFastBackendFactory.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Core\Cache;
+
 use Drupal\Core\Site\Settings;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
diff --git a/core/lib/Drupal/Core/Database/Query/Truncate.php b/core/lib/Drupal/Core/Database/Query/Truncate.php
index 1711adee55..1d8fd36e0f 100644
--- a/core/lib/Drupal/Core/Database/Query/Truncate.php
+++ b/core/lib/Drupal/Core/Database/Query/Truncate.php
@@ -5,7 +5,6 @@
 use Drupal\Core\Database\Database;
 use Drupal\Core\Database\Connection;
 
-
 /**
  * General class for an abstracted TRUNCATE operation.
  */
diff --git a/core/lib/Drupal/Core/Database/StatementEmpty.php b/core/lib/Drupal/Core/Database/StatementEmpty.php
index 343b90ce8e..8b4b38e946 100644
--- a/core/lib/Drupal/Core/Database/StatementEmpty.php
+++ b/core/lib/Drupal/Core/Database/StatementEmpty.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Core\Database;
 
-
 /**
  * Empty implementation of a database statement.
  *
diff --git a/core/lib/Drupal/Core/Entity/Annotation/ContentEntityType.php b/core/lib/Drupal/Core/Entity/Annotation/ContentEntityType.php
index 0817c930f8..b7bf2f8fe1 100644
--- a/core/lib/Drupal/Core/Entity/Annotation/ContentEntityType.php
+++ b/core/lib/Drupal/Core/Entity/Annotation/ContentEntityType.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Core\Entity\Annotation;
+
 use Drupal\Core\StringTranslation\TranslatableMarkup;
 
 /**
diff --git a/core/lib/Drupal/Core/Entity/Query/QueryFactoryInterface.php b/core/lib/Drupal/Core/Entity/Query/QueryFactoryInterface.php
index 85ef13a50a..850bcf2e9f 100644
--- a/core/lib/Drupal/Core/Entity/Query/QueryFactoryInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/QueryFactoryInterface.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Core\Entity\Query;
+
 use Drupal\Core\Entity\EntityTypeInterface;
 
 /**
diff --git a/core/lib/Drupal/Core/EventSubscriber/KernelDestructionSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/KernelDestructionSubscriber.php
index 0619695aac..19272abecb 100644
--- a/core/lib/Drupal/Core/EventSubscriber/KernelDestructionSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/KernelDestructionSubscriber.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Core\EventSubscriber;
+
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
diff --git a/core/lib/Drupal/Core/Extension/module.api.php b/core/lib/Drupal/Core/Extension/module.api.php
index 0830f32872..573f7122c7 100644
--- a/core/lib/Drupal/Core/Extension/module.api.php
+++ b/core/lib/Drupal/Core/Extension/module.api.php
@@ -9,7 +9,6 @@
 use Drupal\Core\Url;
 use Drupal\Core\Utility\UpdateException;
 
-
 /**
  * @defgroup update_api Update API
  * @{
diff --git a/core/lib/Drupal/Core/Field/Plugin/DataType/FieldItem.php b/core/lib/Drupal/Core/Field/Plugin/DataType/FieldItem.php
index 36ccd7831f..cb914955d0 100644
--- a/core/lib/Drupal/Core/Field/Plugin/DataType/FieldItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/DataType/FieldItem.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Core\Field\Plugin\DataType;
 
-
 /**
  * Defines the base plugin for deriving data types for field types.
  *
diff --git a/core/lib/Drupal/Core/Menu/MenuLinkManager.php b/core/lib/Drupal/Core/Menu/MenuLinkManager.php
index e9cd165be9..d6a6094348 100644
--- a/core/lib/Drupal/Core/Menu/MenuLinkManager.php
+++ b/core/lib/Drupal/Core/Menu/MenuLinkManager.php
@@ -10,7 +10,6 @@
 use Drupal\Core\Plugin\Discovery\YamlDiscovery;
 use Drupal\Core\Plugin\Factory\ContainerFactory;
 
-
 /**
  * Manages discovery, instantiation, and tree building of menu link plugins.
  *
diff --git a/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php b/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php
index f014480358..2cda6df985 100644
--- a/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php
+++ b/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Core\Routing;
 
-
 use Drupal\Core\Url;
 use Drupal\Core\Utility\LinkGeneratorInterface;
 
diff --git a/core/lib/Drupal/Core/Template/AttributeValueBase.php b/core/lib/Drupal/Core/Template/AttributeValueBase.php
index 0990eb3fdd..3dfdf4cf4d 100644
--- a/core/lib/Drupal/Core/Template/AttributeValueBase.php
+++ b/core/lib/Drupal/Core/Template/AttributeValueBase.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Core\Template;
+
 use Drupal\Component\Utility\Html;
 
 /**
diff --git a/core/lib/Drupal/Core/Theme/ThemeInitializationInterface.php b/core/lib/Drupal/Core/Theme/ThemeInitializationInterface.php
index 65747176f4..f543c5a339 100644
--- a/core/lib/Drupal/Core/Theme/ThemeInitializationInterface.php
+++ b/core/lib/Drupal/Core/Theme/ThemeInitializationInterface.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Core\Theme;
+
 use Drupal\Core\Extension\Extension;
 
 /**
diff --git a/core/modules/aggregator/tests/src/Functional/UpdateFeedItemTest.php b/core/modules/aggregator/tests/src/Functional/UpdateFeedItemTest.php
index b850ca9ed8..0f76eee70f 100644
--- a/core/modules/aggregator/tests/src/Functional/UpdateFeedItemTest.php
+++ b/core/modules/aggregator/tests/src/Functional/UpdateFeedItemTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Tests\aggregator\Functional;
+
 use Drupal\aggregator\Entity\Feed;
 
 /**
diff --git a/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php b/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php
index 782ac6f14b..4493c5c8d7 100644
--- a/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php
+++ b/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php
@@ -6,7 +6,6 @@
 use Drupal\aggregator\Entity\Item;
 use Drupal\KernelTests\KernelTestBase;
 
-
 /**
  * Tests the aggregator_title formatter.
  *
diff --git a/core/modules/block/tests/src/Functional/BlockFormInBlockTest.php b/core/modules/block/tests/src/Functional/BlockFormInBlockTest.php
index 3b46aee0e4..c0e7f58926 100644
--- a/core/modules/block/tests/src/Functional/BlockFormInBlockTest.php
+++ b/core/modules/block/tests/src/Functional/BlockFormInBlockTest.php
@@ -5,7 +5,6 @@
 use Drupal\Component\Utility\Crypt;
 use Drupal\Tests\BrowserTestBase;
 
-
 /**
  * Tests form in block caching.
  *
diff --git a/core/modules/book/src/BookManagerInterface.php b/core/modules/book/src/BookManagerInterface.php
index 5402bf51d7..324a5da5b0 100644
--- a/core/modules/book/src/BookManagerInterface.php
+++ b/core/modules/book/src/BookManagerInterface.php
@@ -6,7 +6,6 @@
 use Drupal\Core\Session\AccountInterface;
 use Drupal\node\NodeInterface;
 
-
 /**
  * Provides an interface defining a book manager.
  */
diff --git a/core/modules/ckeditor/tests/src/Functional/CKEditorToolbarButtonTest.php b/core/modules/ckeditor/tests/src/Functional/CKEditorToolbarButtonTest.php
index e8d0e2d858..40f00862fe 100644
--- a/core/modules/ckeditor/tests/src/Functional/CKEditorToolbarButtonTest.php
+++ b/core/modules/ckeditor/tests/src/Functional/CKEditorToolbarButtonTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\ckeditor\Functional;
 
-
 use Drupal\filter\Entity\FilterFormat;
 use Drupal\editor\Entity\Editor;
 use Drupal\Tests\BrowserTestBase;
diff --git a/core/modules/comment/src/CommentStatistics.php b/core/modules/comment/src/CommentStatistics.php
index 3c6b571c26..b58452c594 100644
--- a/core/modules/comment/src/CommentStatistics.php
+++ b/core/modules/comment/src/CommentStatistics.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\comment;
 
-
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Entity\EntityChangedInterface;
diff --git a/core/modules/comment/tests/src/Functional/CommentStatusFieldAccessTest.php b/core/modules/comment/tests/src/Functional/CommentStatusFieldAccessTest.php
index e208c7125d..d2495d3791 100644
--- a/core/modules/comment/tests/src/Functional/CommentStatusFieldAccessTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentStatusFieldAccessTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\comment\Functional;
 
-
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\node\Entity\NodeType;
 use Drupal\Tests\BrowserTestBase;
diff --git a/core/modules/comment/tests/src/Functional/CommentTypeTest.php b/core/modules/comment/tests/src/Functional/CommentTypeTest.php
index e4ff2ea6ea..291f9dc3e1 100644
--- a/core/modules/comment/tests/src/Functional/CommentTypeTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentTypeTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Tests\comment\Functional;
+
 use Drupal\comment\Entity\Comment;
 use Drupal\comment\Entity\CommentType;
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
diff --git a/core/modules/config/src/ConfigSubscriber.php b/core/modules/config/src/ConfigSubscriber.php
index 94405a1cd0..d48bbbae39 100644
--- a/core/modules/config/src/ConfigSubscriber.php
+++ b/core/modules/config/src/ConfigSubscriber.php
@@ -6,7 +6,6 @@
 use Drupal\Core\Config\ConfigImporterEvent;
 use Drupal\Core\Config\ConfigImportValidateEventSubscriberBase;
 
-
 /**
  * Config subscriber.
  */
diff --git a/core/modules/config/tests/config_events_test/src/EventSubscriber.php b/core/modules/config/tests/config_events_test/src/EventSubscriber.php
index 98417c02e9..b36a0db7a1 100644
--- a/core/modules/config/tests/config_events_test/src/EventSubscriber.php
+++ b/core/modules/config/tests/config_events_test/src/EventSubscriber.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\config_events_test;
 
-
 use Drupal\Core\Config\ConfigCrudEvent;
 use Drupal\Core\Config\ConfigEvents;
 use Drupal\Core\State\StateInterface;
diff --git a/core/modules/contact/contact.post_update.php b/core/modules/contact/contact.post_update.php
index 7b3b76675a..1cd4555ab4 100644
--- a/core/modules/contact/contact.post_update.php
+++ b/core/modules/contact/contact.post_update.php
@@ -7,7 +7,6 @@
 
 use Drupal\contact\Entity\ContactForm;
 
-
 /**
  * Initialize 'message' and 'redirect' field values to 'contact_form' entities.
  */
diff --git a/core/modules/content_moderation/tests/src/Kernel/EntityOperationsTest.php b/core/modules/content_moderation/tests/src/Kernel/EntityOperationsTest.php
index 7e846411d7..182174488f 100644
--- a/core/modules/content_moderation/tests/src/Kernel/EntityOperationsTest.php
+++ b/core/modules/content_moderation/tests/src/Kernel/EntityOperationsTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\content_moderation\Kernel;
 
-
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
diff --git a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeFormatterBase.php b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeFormatterBase.php
index 6dbc6ca213..98b1ea3857 100644
--- a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeFormatterBase.php
+++ b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeFormatterBase.php
@@ -13,7 +13,6 @@
 use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
-
 /**
  * Base class for 'DateTime Field formatter' plugin implementations.
  */
diff --git a/core/modules/dblog/tests/src/Kernel/DbLogFormInjectionTest.php b/core/modules/dblog/tests/src/Kernel/DbLogFormInjectionTest.php
index c0d97bee35..48ed39616e 100644
--- a/core/modules/dblog/tests/src/Kernel/DbLogFormInjectionTest.php
+++ b/core/modules/dblog/tests/src/Kernel/DbLogFormInjectionTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\dblog\Kernel;
 
-
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Form\FormInterface;
 use Drupal\Core\Form\FormState;
diff --git a/core/modules/field/field.post_update.php b/core/modules/field/field.post_update.php
index d6a809e5f2..cfed3e544b 100644
--- a/core/modules/field/field.post_update.php
+++ b/core/modules/field/field.post_update.php
@@ -9,7 +9,6 @@
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\field\Entity\FieldConfig;
 
-
 /**
  * Re-save all field storage config objects to add 'custom_storage' property.
  */
diff --git a/core/modules/field/src/Tests/NestedFormTest.php b/core/modules/field/src/Tests/NestedFormTest.php
index e9b5f05409..0bbfb0d7dc 100644
--- a/core/modules/field/src/Tests/NestedFormTest.php
+++ b/core/modules/field/src/Tests/NestedFormTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\field\Tests;
+
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldApplicableFormatter.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldApplicableFormatter.php
index 418b4c6b24..0257d36354 100644
--- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldApplicableFormatter.php
+++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldApplicableFormatter.php
@@ -1,11 +1,11 @@
 <?php
 
 namespace Drupal\field_test\Plugin\Field\FieldFormatter;
+
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Field\FormatterBase;
 
-
 /**
  * Plugin implementation of the 'field_test_applicable' formatter.
  *
diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItemWithDependencies.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItemWithDependencies.php
index f1e96dc402..aba356c441 100644
--- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItemWithDependencies.php
+++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItemWithDependencies.php
@@ -4,7 +4,6 @@
 
 use Drupal\Core\Field\FieldDefinitionInterface;
 
-
 /**
  * Defines the 'test_field_with_dependencies' entity field item.
  *
diff --git a/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceItemTest.php b/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceItemTest.php
index 6dce67b45f..391d8db065 100644
--- a/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceItemTest.php
+++ b/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceItemTest.php
@@ -23,7 +23,6 @@
 use Drupal\taxonomy\Entity\Vocabulary;
 use Drupal\user\Entity\User;
 
-
 /**
  * Tests the new entity API for the entity reference field type.
  *
diff --git a/core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php b/core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php
index 03ed8cda90..04c308315b 100644
--- a/core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php
+++ b/core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Tests\field\Kernel;
+
 use Drupal\Component\Utility\Unicode;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
diff --git a/core/modules/field/tests/src/Kernel/WidgetPluginManagerTest.php b/core/modules/field/tests/src/Kernel/WidgetPluginManagerTest.php
index de6f39bd2e..4c92452054 100644
--- a/core/modules/field/tests/src/Kernel/WidgetPluginManagerTest.php
+++ b/core/modules/field/tests/src/Kernel/WidgetPluginManagerTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Tests\field\Kernel;
+
 use Drupal\Core\Field\BaseFieldDefinition;
 
 /**
diff --git a/core/modules/file/src/Tests/FileFieldFormatterAccessTest.php b/core/modules/file/src/Tests/FileFieldFormatterAccessTest.php
index 4d2aee1be3..68bb0473ef 100644
--- a/core/modules/file/src/Tests/FileFieldFormatterAccessTest.php
+++ b/core/modules/file/src/Tests/FileFieldFormatterAccessTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\file\Tests;
 
-
 /**
  * Tests file formatter access.
  * @group file
diff --git a/core/modules/file/tests/src/Kernel/Migrate/d6/FileMigrationTestTrait.php b/core/modules/file/tests/src/Kernel/Migrate/d6/FileMigrationTestTrait.php
index aa506d83ba..0aa4e194ee 100644
--- a/core/modules/file/tests/src/Kernel/Migrate/d6/FileMigrationTestTrait.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/FileMigrationTestTrait.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Tests\file\Kernel\Migrate\d6;
+
 use Drupal\migrate\Plugin\MigrationInterface;
 
 /**
diff --git a/core/modules/file/tests/src/Kernel/Migrate/d7/FileMigrationSetupTrait.php b/core/modules/file/tests/src/Kernel/Migrate/d7/FileMigrationSetupTrait.php
index a59176b784..01fc464cd8 100644
--- a/core/modules/file/tests/src/Kernel/Migrate/d7/FileMigrationSetupTrait.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/d7/FileMigrationSetupTrait.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\file\Kernel\Migrate\d7;
 
-
 use Drupal\Core\StreamWrapper\PublicStream;
 use Drupal\Core\StreamWrapper\StreamWrapperInterface;
 
diff --git a/core/modules/file/tests/src/Kernel/SpaceUsedTest.php b/core/modules/file/tests/src/Kernel/SpaceUsedTest.php
index 7dbc7fdeed..650a289cfa 100644
--- a/core/modules/file/tests/src/Kernel/SpaceUsedTest.php
+++ b/core/modules/file/tests/src/Kernel/SpaceUsedTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Tests\file\Kernel;
+
 use Drupal\file\Entity\File;
 
 /**
diff --git a/core/modules/file/tests/src/Kernel/ValidateTest.php b/core/modules/file/tests/src/Kernel/ValidateTest.php
index 285cc86dc0..0f348d69bd 100644
--- a/core/modules/file/tests/src/Kernel/ValidateTest.php
+++ b/core/modules/file/tests/src/Kernel/ValidateTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\file\Kernel;
 
-
 /**
  * Tests the file_validate() function.
  *
diff --git a/core/modules/forum/src/ForumIndexStorage.php b/core/modules/forum/src/ForumIndexStorage.php
index 20dacbd982..244c223ba6 100644
--- a/core/modules/forum/src/ForumIndexStorage.php
+++ b/core/modules/forum/src/ForumIndexStorage.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\forum;
+
 use Drupal\comment\CommentInterface;
 use Drupal\Core\Database\Connection;
 use Drupal\node\NodeInterface;
diff --git a/core/modules/forum/src/ForumIndexStorageInterface.php b/core/modules/forum/src/ForumIndexStorageInterface.php
index 3e676169d4..3461e162b4 100644
--- a/core/modules/forum/src/ForumIndexStorageInterface.php
+++ b/core/modules/forum/src/ForumIndexStorageInterface.php
@@ -4,7 +4,6 @@
 
 use Drupal\node\NodeInterface;
 
-
 /**
  * Handles CRUD operations to {forum_index} table.
  */
diff --git a/core/modules/locale/tests/src/Kernel/LocaleConfigurableLanguageManagerTest.php b/core/modules/locale/tests/src/Kernel/LocaleConfigurableLanguageManagerTest.php
index e88f49cb50..07909bacc4 100644
--- a/core/modules/locale/tests/src/Kernel/LocaleConfigurableLanguageManagerTest.php
+++ b/core/modules/locale/tests/src/Kernel/LocaleConfigurableLanguageManagerTest.php
@@ -6,7 +6,6 @@
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\KernelTests\KernelTestBase;
 
-
 /**
  * Tests that the configurable language manager and locale operate correctly.
  *
diff --git a/core/modules/migrate/src/MigrateBuildDependencyInterface.php b/core/modules/migrate/src/MigrateBuildDependencyInterface.php
index bb02c8887d..d5a900d70d 100644
--- a/core/modules/migrate/src/MigrateBuildDependencyInterface.php
+++ b/core/modules/migrate/src/MigrateBuildDependencyInterface.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\migrate;
 
-
 interface MigrateBuildDependencyInterface {
 
   /**
diff --git a/core/modules/migrate/src/MigrateMessageInterface.php b/core/modules/migrate/src/MigrateMessageInterface.php
index 628a684fe5..efb30da3a2 100644
--- a/core/modules/migrate/src/MigrateMessageInterface.php
+++ b/core/modules/migrate/src/MigrateMessageInterface.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\migrate;
 
-
 interface MigrateMessageInterface {
 
   /**
diff --git a/core/modules/migrate/src/Plugin/migrate/process/Flatten.php b/core/modules/migrate/src/Plugin/migrate/process/Flatten.php
index ceb7ea73ad..324f0b92c8 100644
--- a/core/modules/migrate/src/Plugin/migrate/process/Flatten.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/Flatten.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\migrate\Plugin\migrate\process;
+
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
diff --git a/core/modules/migrate/src/Plugin/migrate/process/Log.php b/core/modules/migrate/src/Plugin/migrate/process/Log.php
index af262ff562..62088f607e 100644
--- a/core/modules/migrate/src/Plugin/migrate/process/Log.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/Log.php
@@ -6,7 +6,6 @@
 use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
 
-
 /**
  * Logs values without changing them.
  *
diff --git a/core/modules/migrate/tests/src/Unit/process/FlattenTest.php b/core/modules/migrate/tests/src/Unit/process/FlattenTest.php
index 484cfc78d2..73b20c238f 100644
--- a/core/modules/migrate/tests/src/Unit/process/FlattenTest.php
+++ b/core/modules/migrate/tests/src/Unit/process/FlattenTest.php
@@ -1,8 +1,8 @@
 <?php
 
 namespace Drupal\Tests\migrate\Unit\process;
-use Drupal\migrate\Plugin\migrate\process\Flatten;
 
+use Drupal\migrate\Plugin\migrate\process\Flatten;
 
 /**
  * Tests the flatten plugin.
diff --git a/core/modules/migrate_drupal/src/MigrationCreationTrait.php b/core/modules/migrate_drupal/src/MigrationCreationTrait.php
index 644625ce5c..7894e91cbe 100644
--- a/core/modules/migrate_drupal/src/MigrationCreationTrait.php
+++ b/core/modules/migrate_drupal/src/MigrationCreationTrait.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\migrate_drupal;
 
-
 /**
  * @deprecated in Drupal 8.1.x, will be removed before Drupal 9.0.0. Use
  *   \Drupal\migrate_drupal\MigrationConfigurationTrait instead.
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/EmptySource.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/EmptySource.php
index 6792e5e052..e0acc4b52e 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/EmptySource.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/EmptySource.php
@@ -10,7 +10,6 @@
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 
-
 /**
  * Source returning an empty row with Drupal specific config dependencies.
  *
diff --git a/core/modules/node/src/Plugin/migrate/source/d6/NodeRevision.php b/core/modules/node/src/Plugin/migrate/source/d6/NodeRevision.php
index a0103fc00f..629249888d 100644
--- a/core/modules/node/src/Plugin/migrate/source/d6/NodeRevision.php
+++ b/core/modules/node/src/Plugin/migrate/source/d6/NodeRevision.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\node\Plugin\migrate\source\d6;
+
 use Drupal\Core\Database\Query\SelectInterface;
 
 /**
diff --git a/core/modules/node/tests/modules/node_test/node_test.module b/core/modules/node/tests/modules/node_test/node_test.module
index 3532c37300..a2f06decce 100644
--- a/core/modules/node/tests/modules/node_test/node_test.module
+++ b/core/modules/node/tests/modules/node_test/node_test.module
@@ -14,7 +14,6 @@
 use Drupal\Core\Session\AccountInterface;
 use Drupal\node\NodeInterface;
 
-
 /**
  * Implements hook_ENTITY_TYPE_view() for node entities.
  */
diff --git a/core/modules/node/tests/src/Functional/Migrate/d6/MigrateNodeRevisionTest.php b/core/modules/node/tests/src/Functional/Migrate/d6/MigrateNodeRevisionTest.php
index 1b032c7ca7..075e727678 100644
--- a/core/modules/node/tests/src/Functional/Migrate/d6/MigrateNodeRevisionTest.php
+++ b/core/modules/node/tests/src/Functional/Migrate/d6/MigrateNodeRevisionTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Tests\node\Functional\Migrate\d6;
+
 use Drupal\Tests\node\Kernel\Migrate\d6\MigrateNodeTestBase;
 
 /**
diff --git a/core/modules/node/tests/src/Functional/MultiStepNodeFormBasicOptionsTest.php b/core/modules/node/tests/src/Functional/MultiStepNodeFormBasicOptionsTest.php
index 46b803ec63..fbdb200cc5 100644
--- a/core/modules/node/tests/src/Functional/MultiStepNodeFormBasicOptionsTest.php
+++ b/core/modules/node/tests/src/Functional/MultiStepNodeFormBasicOptionsTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Tests\node\Functional;
+
 use Drupal\Component\Utility\Unicode;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
diff --git a/core/modules/node/tests/src/Functional/NodeAccessFieldTest.php b/core/modules/node/tests/src/Functional/NodeAccessFieldTest.php
index 082f288c68..8028ec9f97 100644
--- a/core/modules/node/tests/src/Functional/NodeAccessFieldTest.php
+++ b/core/modules/node/tests/src/Functional/NodeAccessFieldTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Tests\node\Functional;
+
 use Drupal\Component\Utility\Unicode;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php
index c6acb5683a..c879e72c7e 100644
--- a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php
+++ b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\responsive_image\Tests;
 
-
 use Drupal\field_ui\Tests\FieldUiTestTrait;
 use Drupal\simpletest\WebTestBase;
 use Drupal\responsive_image\Entity\ResponsiveImageStyle;
diff --git a/core/modules/rest/src/ResourceResponseTrait.php b/core/modules/rest/src/ResourceResponseTrait.php
index d16bc19821..c61e4e6349 100644
--- a/core/modules/rest/src/ResourceResponseTrait.php
+++ b/core/modules/rest/src/ResourceResponseTrait.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\rest;
 
-
 trait ResourceResponseTrait {
 
   /**
diff --git a/core/modules/search/tests/src/Functional/SearchSimplifyTest.php b/core/modules/search/tests/src/Functional/SearchSimplifyTest.php
index bd3bbb43d6..c306119912 100644
--- a/core/modules/search/tests/src/Functional/SearchSimplifyTest.php
+++ b/core/modules/search/tests/src/Functional/SearchSimplifyTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Tests\search\Functional;
+
 use Drupal\Component\Utility\Unicode;
 
 /**
diff --git a/core/modules/search/tests/src/Functional/SearchTokenizerTest.php b/core/modules/search/tests/src/Functional/SearchTokenizerTest.php
index 7215312d01..218ec185b1 100644
--- a/core/modules/search/tests/src/Functional/SearchTokenizerTest.php
+++ b/core/modules/search/tests/src/Functional/SearchTokenizerTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Tests\search\Functional;
+
 use Drupal\Component\Utility\Unicode;
 
 /**
diff --git a/core/modules/system/src/Tests/Installer/DistributionProfileExistingSettingsTest.php b/core/modules/system/src/Tests/Installer/DistributionProfileExistingSettingsTest.php
index 2fe5d4f1bc..48b9fcb753 100644
--- a/core/modules/system/src/Tests/Installer/DistributionProfileExistingSettingsTest.php
+++ b/core/modules/system/src/Tests/Installer/DistributionProfileExistingSettingsTest.php
@@ -9,7 +9,6 @@
 use Drupal\simpletest\InstallerTestBase;
 use Symfony\Component\HttpFoundation\Request;
 
-
 /**
  * Tests distribution profile support with existing settings.
  *
diff --git a/core/modules/system/src/Tests/Module/DependencyTest.php b/core/modules/system/src/Tests/Module/DependencyTest.php
index c68e9fab71..173380ebd6 100644
--- a/core/modules/system/src/Tests/Module/DependencyTest.php
+++ b/core/modules/system/src/Tests/Module/DependencyTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\system\Tests\Module;
+
 use Drupal\Component\Utility\Unicode;
 
 /**
diff --git a/core/modules/system/src/Tests/System/UncaughtExceptionTest.php b/core/modules/system/src/Tests/System/UncaughtExceptionTest.php
index b66837e1c7..02c09562ee 100644
--- a/core/modules/system/src/Tests/System/UncaughtExceptionTest.php
+++ b/core/modules/system/src/Tests/System/UncaughtExceptionTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\system\Tests\System;
 
-
 use Drupal\simpletest\WebTestBase;
 
 /**
diff --git a/core/modules/system/tests/fixtures/update/drupal-8.broken_routing.php b/core/modules/system/tests/fixtures/update/drupal-8.broken_routing.php
index 604321ddc8..e06cd1c581 100644
--- a/core/modules/system/tests/fixtures/update/drupal-8.broken_routing.php
+++ b/core/modules/system/tests/fixtures/update/drupal-8.broken_routing.php
@@ -7,7 +7,6 @@
 
 use Drupal\Core\Database\Database;
 
-
 $connection = Database::getConnection();
 
 $config = unserialize($connection->query("SELECT data FROM {config} where name = :name", [':name' => 'core.extension'])->fetchField());
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestCompositeConstraint.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestCompositeConstraint.php
index bd28b346b8..3ace146575 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestCompositeConstraint.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestCompositeConstraint.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\entity_test\Entity;
+
 use Drupal\Core\Entity\EntityTypeInterface;
 
 /**
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestStringId.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestStringId.php
index 342cbb9b16..85a5e66769 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestStringId.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestStringId.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\entity_test\Entity;
+
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Entity\EntityTypeInterface;
 
diff --git a/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/FieldTestItem.php b/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/FieldTestItem.php
index df2b89b592..b7336c15e1 100644
--- a/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/FieldTestItem.php
+++ b/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/FieldTestItem.php
@@ -9,7 +9,6 @@
 use Drupal\Core\TypedData\DataDefinitionInterface;
 use Drupal\Core\TypedData\TypedDataInterface;
 
-
 /**
  * Defines the 'field_test' entity field type.
  *
diff --git a/core/modules/system/tests/modules/render_placeholder_message_test/src/RenderPlaceholderMessageTestController.php b/core/modules/system/tests/modules/render_placeholder_message_test/src/RenderPlaceholderMessageTestController.php
index 7b0850e564..4a4d15d897 100644
--- a/core/modules/system/tests/modules/render_placeholder_message_test/src/RenderPlaceholderMessageTestController.php
+++ b/core/modules/system/tests/modules/render_placeholder_message_test/src/RenderPlaceholderMessageTestController.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\render_placeholder_message_test;
+
 use Drupal\Core\Render\RenderContext;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
diff --git a/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php b/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
index 151c1409ee..adebf28ddd 100644
--- a/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
+++ b/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
@@ -10,7 +10,6 @@
 use Symfony\Component\HttpFoundation\Response;
 use Zend\Diactoros\Response\HtmlResponse;
 
-
 /**
  * Controller routines for testing the routing system.
  */
diff --git a/core/modules/system/tests/modules/token_test/src/Controller/TestController.php b/core/modules/system/tests/modules/token_test/src/Controller/TestController.php
index 9f712ed382..019dbf79af 100644
--- a/core/modules/system/tests/modules/token_test/src/Controller/TestController.php
+++ b/core/modules/system/tests/modules/token_test/src/Controller/TestController.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\token_test\Controller;
 
-
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Utility\Token;
diff --git a/core/modules/system/tests/modules/trusted_hosts_test/src/Controller/TrustedHostsTestController.php b/core/modules/system/tests/modules/trusted_hosts_test/src/Controller/TrustedHostsTestController.php
index 68c8b64e52..bb768421f0 100644
--- a/core/modules/system/tests/modules/trusted_hosts_test/src/Controller/TrustedHostsTestController.php
+++ b/core/modules/system/tests/modules/trusted_hosts_test/src/Controller/TrustedHostsTestController.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\trusted_hosts_test\Controller;
+
 use Symfony\Component\HttpFoundation\Request;
 
 /**
diff --git a/core/modules/system/tests/modules/twig_extension_test/src/TwigExtension/TestExtension.php b/core/modules/system/tests/modules/twig_extension_test/src/TwigExtension/TestExtension.php
index b364c59dd7..93be201e5c 100644
--- a/core/modules/system/tests/modules/twig_extension_test/src/TwigExtension/TestExtension.php
+++ b/core/modules/system/tests/modules/twig_extension_test/src/TwigExtension/TestExtension.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\twig_extension_test\TwigExtension;
 
-
 /**
  * A test Twig extension that adds a custom function and a custom filter.
  */
diff --git a/core/modules/taxonomy/tests/src/Functional/VocabularyUiTest.php b/core/modules/taxonomy/tests/src/Functional/VocabularyUiTest.php
index 9d477105bf..e39a0d8555 100644
--- a/core/modules/taxonomy/tests/src/Functional/VocabularyUiTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/VocabularyUiTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Tests\taxonomy\Functional;
+
 use Drupal\Component\Utility\Unicode;
 
 use Drupal\Core\Url;
diff --git a/core/modules/toolbar/tests/src/Functional/ToolbarCacheContextsTest.php b/core/modules/toolbar/tests/src/Functional/ToolbarCacheContextsTest.php
index 5e4a0a257e..26454762ea 100644
--- a/core/modules/toolbar/tests/src/Functional/ToolbarCacheContextsTest.php
+++ b/core/modules/toolbar/tests/src/Functional/ToolbarCacheContextsTest.php
@@ -7,7 +7,6 @@
 use Drupal\Tests\system\Functional\Cache\AssertPageCacheContextsAndTagsTrait;
 use Drupal\Tests\BrowserTestBase;
 
-
 /**
  * Tests the cache contexts for toolbar.
  *
diff --git a/core/modules/update/src/UpdateProcessorInterface.php b/core/modules/update/src/UpdateProcessorInterface.php
index f744bfb2a0..22ae904fba 100644
--- a/core/modules/update/src/UpdateProcessorInterface.php
+++ b/core/modules/update/src/UpdateProcessorInterface.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\update;
 
-
 /**
  * Processor of project update information.
  */
diff --git a/core/modules/user/src/Tests/Views/BulkFormAccessTest.php b/core/modules/user/src/Tests/Views/BulkFormAccessTest.php
index 2b36240442..a6ab3c8613 100644
--- a/core/modules/user/src/Tests/Views/BulkFormAccessTest.php
+++ b/core/modules/user/src/Tests/Views/BulkFormAccessTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\user\Tests\Views;
+
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\user\Entity\User;
 
diff --git a/core/modules/views/src/Annotation/ViewsAccess.php b/core/modules/views/src/Annotation/ViewsAccess.php
index fde990d887..9cfcb24cd1 100644
--- a/core/modules/views/src/Annotation/ViewsAccess.php
+++ b/core/modules/views/src/Annotation/ViewsAccess.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\views\Annotation;
 
-
 /**
  * Defines a Plugin annotation object for views access plugins.
  *
diff --git a/core/modules/views/src/Plugin/Block/ViewsExposedFilterBlock.php b/core/modules/views/src/Plugin/Block/ViewsExposedFilterBlock.php
index ec066ab64e..4b40a0d31d 100644
--- a/core/modules/views/src/Plugin/Block/ViewsExposedFilterBlock.php
+++ b/core/modules/views/src/Plugin/Block/ViewsExposedFilterBlock.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\views\Plugin\Block;
+
 use Drupal\Core\Cache\Cache;
 
 /**
diff --git a/core/modules/views/src/Tests/Handler/HandlerTestBase.php b/core/modules/views/src/Tests/Handler/HandlerTestBase.php
index 1603329bdb..da4ecece9a 100644
--- a/core/modules/views/src/Tests/Handler/HandlerTestBase.php
+++ b/core/modules/views/src/Tests/Handler/HandlerTestBase.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\views\Tests\Handler;
+
 @trigger_error('\Drupal\views\Tests\Handler\HandlerTestBase is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, use \Drupal\Tests\views\Functional\ViewTestBase', E_USER_DEPRECATED);
 
 use Drupal\views\Tests\ViewTestBase;
diff --git a/core/modules/views/src/Tests/Plugin/PluginTestBase.php b/core/modules/views/src/Tests/Plugin/PluginTestBase.php
index c386181103..d8e2292310 100644
--- a/core/modules/views/src/Tests/Plugin/PluginTestBase.php
+++ b/core/modules/views/src/Tests/Plugin/PluginTestBase.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\views\Tests\Plugin;
+
 @trigger_error('\Drupal\views\Tests\Plugin\PluginTestBase is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, use \Drupal\Tests\views\Functional\ViewTestBase', E_USER_DEPRECATED);
 
 use Drupal\views\Tests\ViewTestBase;
diff --git a/core/modules/views/src/Tests/ViewTestBase.php b/core/modules/views/src/Tests/ViewTestBase.php
index 8d09a0940d..3121ce8196 100644
--- a/core/modules/views/src/Tests/ViewTestBase.php
+++ b/core/modules/views/src/Tests/ViewTestBase.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\views\Tests;
+
 @trigger_error('\Drupal\views\Tests\ViewTestBase is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, use \Drupal\Tests\views\Functional\ViewTestBase', E_USER_DEPRECATED);
 
 use Drupal\Core\Database\Query\SelectInterface;
diff --git a/core/modules/views/src/Tests/Wizard/WizardTestBase.php b/core/modules/views/src/Tests/Wizard/WizardTestBase.php
index f5f7cc0514..ba7509c865 100644
--- a/core/modules/views/src/Tests/Wizard/WizardTestBase.php
+++ b/core/modules/views/src/Tests/Wizard/WizardTestBase.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\views\Tests\Wizard;
+
 @trigger_error('\Drupal\views\Tests\Wizard\WizardTestBase is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, use \Drupal\Tests\views\Functional\Wizard\WizardTestBase', E_USER_DEPRECATED);
 
 use Drupal\views\Tests\ViewTestBase;
diff --git a/core/modules/views/tests/modules/views_entity_test/views_entity_test.module b/core/modules/views/tests/modules/views_entity_test/views_entity_test.module
index cd136538f2..6ed0772eda 100644
--- a/core/modules/views/tests/modules/views_entity_test/views_entity_test.module
+++ b/core/modules/views/tests/modules/views_entity_test/views_entity_test.module
@@ -12,7 +12,6 @@
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Session\AccountInterface;
 
-
 /**
  * Implements hook_entity_bundle_field_info().
  */
diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/argument_validator/ArgumentValidatorTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/argument_validator/ArgumentValidatorTest.php
index 61ef3279ac..ff251b294d 100644
--- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/argument_validator/ArgumentValidatorTest.php
+++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/argument_validator/ArgumentValidatorTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\views_test_data\Plugin\views\argument_validator;
+
 use Drupal\views\Plugin\views\argument_validator\ArgumentValidatorPluginBase;
 
 /**
diff --git a/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php b/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
index ea2f5b2373..57eb2320b8 100644
--- a/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
@@ -10,7 +10,6 @@
 use Drupal\views_test_data\Plugin\views\argument_default\ArgumentDefaultTest as ArgumentDefaultTestPlugin;
 use Symfony\Component\HttpFoundation\Request;
 
-
 /**
  * Tests pluggable argument_default for views.
  *
diff --git a/core/modules/views/tests/src/Kernel/Handler/EntityTestViewsFieldAccessTest.php b/core/modules/views/tests/src/Kernel/Handler/EntityTestViewsFieldAccessTest.php
index 3492ff150d..ee219ab7a4 100644
--- a/core/modules/views/tests/src/Kernel/Handler/EntityTestViewsFieldAccessTest.php
+++ b/core/modules/views/tests/src/Kernel/Handler/EntityTestViewsFieldAccessTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Tests\views\Kernel\Handler;
+
 use Drupal\entity_test\Entity\EntityTest;
 
 /**
diff --git a/core/modules/views/tests/src/Kernel/Plugin/FieldOrLanguageJoinTest.php b/core/modules/views/tests/src/Kernel/Plugin/FieldOrLanguageJoinTest.php
index 1f9c6dabd1..940ab7acad 100644
--- a/core/modules/views/tests/src/Kernel/Plugin/FieldOrLanguageJoinTest.php
+++ b/core/modules/views/tests/src/Kernel/Plugin/FieldOrLanguageJoinTest.php
@@ -5,7 +5,6 @@
 use Drupal\views\Plugin\views\join\FieldOrLanguageJoin;
 use Drupal\views\Views;
 
-
 /**
  * Tests the "field OR language" join plugin.
  *
diff --git a/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php b/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php
index 0839fcb2c8..1c196a1d98 100644
--- a/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php
+++ b/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php
@@ -6,7 +6,6 @@
 use Drupal\views\Plugin\views\join\JoinPluginBase;
 use Drupal\views\Views;
 
-
 /**
  * Tests the join plugin.
  *
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 5b07e1e868..6c237a3059 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -158,6 +158,10 @@
   <rule ref="PSR2.Classes.PropertyDeclaration">
     <exclude name="PSR2.Classes.PropertyDeclaration.Underscore"/>
   </rule>
+  <rule ref="PSR2.Namespaces.NamespaceDeclaration" />
+  <rule ref="PSR2.Namespaces.UseDeclaration">
+    <exclude name="PSR2.Namespaces.UseDeclaration.UseAfterNamespace"/>
+  </rule>
 
   <!-- Squiz sniffs -->
   <rule ref="Squiz.Arrays.ArrayBracketSpacing"/>
diff --git a/core/tests/Drupal/FunctionalTests/Image/ToolkitTestBase.php b/core/tests/Drupal/FunctionalTests/Image/ToolkitTestBase.php
index cf024e26ef..2f6b7ccd7c 100644
--- a/core/tests/Drupal/FunctionalTests/Image/ToolkitTestBase.php
+++ b/core/tests/Drupal/FunctionalTests/Image/ToolkitTestBase.php
@@ -6,7 +6,6 @@
 use Drupal\Tests\BrowserTestBase;
 use Drupal\Tests\TestFileCreationTrait;
 
-
 /**
  * Base class for image manipulation testing.
  */
diff --git a/core/tests/Drupal/KernelTests/Core/Config/SchemaCheckTraitTest.php b/core/tests/Drupal/KernelTests/Core/Config/SchemaCheckTraitTest.php
index 68a8962e56..a11bcb6592 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/SchemaCheckTraitTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/SchemaCheckTraitTest.php
@@ -5,7 +5,6 @@
 use Drupal\Core\Config\Schema\SchemaCheckTrait;
 use Drupal\KernelTests\KernelTestBase;
 
-
 /**
  * Tests the functionality of SchemaCheckTrait.
  *
diff --git a/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php b/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php
index 3472e2bc4b..c28e1aa4c2 100644
--- a/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\KernelTests\Core\Database;
+
 use Drupal\Core\Database\InvalidQueryException;
 use Drupal\Core\Database\Database;
 
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityNonRevisionableTranslatableFieldTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityNonRevisionableTranslatableFieldTest.php
index 7e6d0093b8..2160da96e5 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/EntityNonRevisionableTranslatableFieldTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityNonRevisionableTranslatableFieldTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\KernelTests\Core\Entity;
+
 use Drupal\entity_test\Entity\EntityTestMulRev;
 use Drupal\language\Entity\ConfigurableLanguage;
 
diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php
index 038e018ea0..3c44752748 100644
--- a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php
+++ b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php
@@ -646,6 +646,7 @@ protected function getParameterCall($name) {
  * define a dummy, else it cannot be tested.
  */
 namespace Symfony\Component\ExpressionLanguage {
+
   if (!class_exists('\Symfony\Component\ExpressionLanguage\Expression')) {
     /**
      * Dummy class to ensure non-existent Symfony component can be tested.
diff --git a/core/tests/Drupal/Tests/Component/Utility/CryptRandomFallbackTest.php b/core/tests/Drupal/Tests/Component/Utility/CryptRandomFallbackTest.php
index c87af872b3..4d02e1e804 100644
--- a/core/tests/Drupal/Tests/Component/Utility/CryptRandomFallbackTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/CryptRandomFallbackTest.php
@@ -52,7 +52,7 @@ public function testRandomBytesFallback() {
 
 namespace Drupal\Component\Utility;
 
-use  Drupal\Tests\Component\Utility\CryptRandomFallbackTest;
+use Drupal\Tests\Component\Utility\CryptRandomFallbackTest;
 
 /**
  * Defines a function in same namespace as Drupal\Component\Utility\Crypt.
diff --git a/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php b/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php
index 3dc70c214c..9ca4ffff85 100644
--- a/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php
+++ b/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php
@@ -243,6 +243,7 @@ public function findFile() {
 
 
 namespace {
+
   if (!function_exists('drupal_valid_test_ua')) {
     function drupal_valid_test_ua($new_prefix = NULL) {
       return FALSE;
diff --git a/core/tests/Drupal/Tests/Core/Http/TrustedHostsRequestFactoryTest.php b/core/tests/Drupal/Tests/Core/Http/TrustedHostsRequestFactoryTest.php
index 9502dd671c..8adb03cbca 100644
--- a/core/tests/Drupal/Tests/Core/Http/TrustedHostsRequestFactoryTest.php
+++ b/core/tests/Drupal/Tests/Core/Http/TrustedHostsRequestFactoryTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Tests\Core\Http;
+
 use Drupal\Core\Http\TrustedHostsRequestFactory;
 use Drupal\Tests\UnitTestCase;
 
diff --git a/core/tests/Drupal/Tests/Core/ProxyBuilder/ProxyBuilderTest.php b/core/tests/Drupal/Tests/Core/ProxyBuilder/ProxyBuilderTest.php
index 5f0779e33e..72a8aa88a1 100644
--- a/core/tests/Drupal/Tests/Core/ProxyBuilder/ProxyBuilderTest.php
+++ b/core/tests/Drupal/Tests/Core/ProxyBuilder/ProxyBuilderTest.php
@@ -6,6 +6,7 @@
  */
 
 namespace Drupal\Tests\Core\ProxyBuilder;
+
 use Drupal\Core\ProxyBuilder\ProxyBuilder;
 use Drupal\Tests\UnitTestCase;
 
diff --git a/core/tests/Drupal/Tests/UnitTestCase.php b/core/tests/Drupal/Tests/UnitTestCase.php
index 5139f97730..24ad6801bf 100644
--- a/core/tests/Drupal/Tests/UnitTestCase.php
+++ b/core/tests/Drupal/Tests/UnitTestCase.php
@@ -10,7 +10,6 @@
 use Drupal\Core\StringTranslation\PluralTranslatableMarkup;
 use PHPUnit\Framework\TestCase;
 
-
 /**
  * Provides a base class and helpers for Drupal unit tests.
  *
diff --git a/core/tests/TestSuites/TestSuiteBase.php b/core/tests/TestSuites/TestSuiteBase.php
index 581ea36714..82a13ba255 100644
--- a/core/tests/TestSuites/TestSuiteBase.php
+++ b/core/tests/TestSuites/TestSuiteBase.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Tests\TestSuites;
+
 use Drupal\simpletest\TestDiscovery;
 
 /**