diff --git a/core/lib/Drupal/Component/Utility/Html.php b/core/lib/Drupal/Component/Utility/Html.php
index 193f01b21fa9892ac5a27bc786b7147eca42a548..b9590c2a2320085f07a1c7ee7c641c817d0e090d 100644
--- a/core/lib/Drupal/Component/Utility/Html.php
+++ b/core/lib/Drupal/Component/Utility/Html.php
@@ -28,6 +28,7 @@ class Html {
 
   /**
    * An array of IDs, including incremented versions when an ID is duplicated.
+   *
    * @var array
    */
   protected static $seenIds;
diff --git a/core/lib/Drupal/Core/Asset/AssetResolverInterface.php b/core/lib/Drupal/Core/Asset/AssetResolverInterface.php
index 0fac59ca44ac091fa2107bc7884e1c6bc184d328..19a43c1948a5f16e24d3ead6a6bee8a702dc3a4f 100644
--- a/core/lib/Drupal/Core/Asset/AssetResolverInterface.php
+++ b/core/lib/Drupal/Core/Asset/AssetResolverInterface.php
@@ -29,6 +29,7 @@ interface AssetResolverInterface {
    * - CSS_COMPONENT
    * - CSS_STATE
    * - CSS_THEME
+   *
    * @see https://www.drupal.org/node/1887918#separate-concerns
    * This ensures proper cascading of styles so themes can easily override
    * module styles through CSS selectors.
diff --git a/core/lib/Drupal/Core/Cache/Context/CacheContextInterface.php b/core/lib/Drupal/Core/Cache/Context/CacheContextInterface.php
index b7538fa67d03826a15961f8113ca684bfff669df..3c50b498e78a571d814cc853237fcf3d00fb7f1b 100644
--- a/core/lib/Drupal/Core/Cache/Context/CacheContextInterface.php
+++ b/core/lib/Drupal/Core/Cache/Context/CacheContextInterface.php
@@ -37,7 +37,6 @@ public function getContext();
    *   if this is optimized away to allow for invalidation if the context
    *   value changes.
    *
-   *
    * @return \Drupal\Core\Cache\CacheableMetadata
    *   A cacheable metadata object.
    */
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityUpdater.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityUpdater.php
index bd3128fe19d4d9c2c16947908795b746bca284d1..e6f535a0eee059358e6222f5a166c182279cae84 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityUpdater.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityUpdater.php
@@ -42,6 +42,7 @@ class ConfigEntityUpdater implements ContainerInjectionInterface {
 
   /**
    * The number of entities to process in each batch.
+   *
    * @var int
    */
   protected $batchSize;
diff --git a/core/lib/Drupal/Core/Database/Query/Select.php b/core/lib/Drupal/Core/Database/Query/Select.php
index 290cbbf487c960815b094874e433043e58430085..bf8414aebc3a2f90d7f148ee1fe7fec4a7b6f2dc 100644
--- a/core/lib/Drupal/Core/Database/Query/Select.php
+++ b/core/lib/Drupal/Core/Database/Query/Select.php
@@ -107,6 +107,7 @@ class Select extends Query implements SelectInterface {
 
   /**
    * Indicates if preExecute() has already been called.
+   *
    * @var bool
    */
   protected $prepared = FALSE;
diff --git a/core/lib/Drupal/Core/Entity/EntityInterface.php b/core/lib/Drupal/Core/Entity/EntityInterface.php
index 1547a3879e39151eed00fe404fd83fcdf487e5ca..cb6292333dffce8dc6eeef9196552a68218df76c 100644
--- a/core/lib/Drupal/Core/Entity/EntityInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityInterface.php
@@ -239,6 +239,7 @@ public function delete();
    * over all translations if needed. This is different from its counterpart in
    * the Field API, FieldItemListInterface::preSave(), which is fired on all
    * field translations automatically.
+   *
    * @todo Adjust existing implementations and the documentation according to
    *   https://www.drupal.org/node/2577609 to have a consistent API.
    *
diff --git a/core/lib/Drupal/Core/Entity/TranslatableRevisionableInterface.php b/core/lib/Drupal/Core/Entity/TranslatableRevisionableInterface.php
index 7460eeb16b6c7b820b7054bb7163f62d68e5136b..98c390ce420b31ebfaab8b827a91ff528f03b26a 100644
--- a/core/lib/Drupal/Core/Entity/TranslatableRevisionableInterface.php
+++ b/core/lib/Drupal/Core/Entity/TranslatableRevisionableInterface.php
@@ -23,6 +23,7 @@ public function isLatestTranslationAffectedRevision();
    * through the field directly will always enforce it, which will be used by
    * the entity storage to determine if the flag should be recomputed or the set
    * value should be used instead.
+   *
    * @see \Drupal\Core\Entity\ContentEntityStorageBase::populateAffectedRevisionTranslations()
    *
    * @param bool|null $affected
@@ -58,6 +59,7 @@ public function isRevisionTranslationAffectedEnforced();
    * Note that this method call will not have any influence on the storage if
    * the value of the revision translation affected flag is NULL which is used
    * as an indication for the storage to recompute the flag.
+   *
    * @see \Drupal\Core\Entity\ContentEntityInterface::setRevisionTranslationAffected()
    *
    * @param bool $enforced
diff --git a/core/lib/Drupal/Core/Field/FieldConfigBase.php b/core/lib/Drupal/Core/Field/FieldConfigBase.php
index 2a17596587469ddab1b8c8759f708eca49b96062..39405c37d437dae592076ecb5ce9a65ba96dd26b 100644
--- a/core/lib/Drupal/Core/Field/FieldConfigBase.php
+++ b/core/lib/Drupal/Core/Field/FieldConfigBase.php
@@ -472,6 +472,7 @@ public function setDefaultValueCallback($callback) {
    *
    * Using the Serialize interface and serialize() / unserialize() methods
    * breaks entity forms in PHP 5.4.
+   *
    * @todo Investigate in https://www.drupal.org/node/1977206.
    */
   public function __sleep(): array {
diff --git a/core/lib/Drupal/Core/Render/Element/Email.php b/core/lib/Drupal/Core/Render/Element/Email.php
index 197b500038f360ad67872b81690e3ed5ca7a94dd..fd721eb365761f64cbd134592824da7e611d4489 100644
--- a/core/lib/Drupal/Core/Render/Element/Email.php
+++ b/core/lib/Drupal/Core/Render/Element/Email.php
@@ -35,6 +35,7 @@ class Email extends FormElementBase {
    * specifies a total length of 320 characters, but mentions that
    * addresses longer than 256 characters are not normally useful. Erratum
    * 1690 was then released which corrected this value to 254 characters.
+   *
    * @see http://tools.ietf.org/html/rfc3696#section-3
    * @see http://www.rfc-editor.org/errata_search.php?rfc=3696&eid=1690
    */
diff --git a/core/lib/Drupal/Core/Render/Element/HtmlTag.php b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
index 48b924600c1431a989d0981ec3814ab14492889a..0d69b2f0706ff5bdc6ec2eb3be0aee31d05573e6 100644
--- a/core/lib/Drupal/Core/Render/Element/HtmlTag.php
+++ b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
@@ -37,6 +37,7 @@ class HtmlTag extends RenderElementBase {
 
   /**
    * Void elements do not contain values or closing tags.
+   *
    * @see https://www.w3.org/TR/html5/syntax.html#syntax-start-tag
    * @see https://www.w3.org/TR/html5/syntax.html#void-elements
    */
diff --git a/core/lib/Drupal/Core/Render/Element/Pager.php b/core/lib/Drupal/Core/Render/Element/Pager.php
index 795909e5997f7c886d33fa1172ac6256c0b355c5..1977b5bf6d39bbf3cf89cf6cc6720e82cbf95038 100644
--- a/core/lib/Drupal/Core/Render/Element/Pager.php
+++ b/core/lib/Drupal/Core/Render/Element/Pager.php
@@ -64,7 +64,6 @@ public function getInfo() {
   /**
    * #pre_render callback to associate the appropriate cache context.
    *
-   *
    * @param array $pager
    *   A renderable array of #type => pager.
    *
diff --git a/core/lib/Drupal/Core/Render/Element/Select.php b/core/lib/Drupal/Core/Render/Element/Select.php
index 5d328ace1df6becb29f6c6015a48f4e75c933028..79a6a514057e7f14eb53c174bcb0c8f1e0217e87 100644
--- a/core/lib/Drupal/Core/Render/Element/Select.php
+++ b/core/lib/Drupal/Core/Render/Element/Select.php
@@ -48,6 +48,7 @@
  *     since all user agents automatically preselect the first available
  *     option. But people are used to this being the behavior of select
  *     controls.
+ *
  *     @todo Address the above issue in Drupal 8.
  *   - If #required is not TRUE and this value is set (most commonly to an
  *     empty string), then an extra option (see #empty_option above)
diff --git a/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php b/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
index b0cce3f255191bb4f76614c39ed2e311db79ef95..bcceafabee1fd5a5253eb06c0404af2f90593d0a 100644
--- a/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
+++ b/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
@@ -22,7 +22,10 @@
 /**
  * Default main content renderer for HTML requests.
  *
- * For attachment handling of HTML responses:
+ * Attachments in HTML responses are handled by
+ * \Drupal\Core\Render\AttachmentsResponseProcessorInterface and
+ * \Drupal\Core\Render\HtmlResponseAttachmentsProcessor
+ *
  * @see template_preprocess_html()
  * @see \Drupal\Core\Render\AttachmentsResponseProcessorInterface
  * @see \Drupal\Core\Render\BareHtmlPageRenderer
diff --git a/core/lib/Drupal/Core/Template/Loader/FilesystemLoader.php b/core/lib/Drupal/Core/Template/Loader/FilesystemLoader.php
index e9620f6a57ba6b3174faabf4cff6d31466c24e8c..22a73ef3be15bc19170e8e54663f5e7acbe74b1b 100644
--- a/core/lib/Drupal/Core/Template/Loader/FilesystemLoader.php
+++ b/core/lib/Drupal/Core/Template/Loader/FilesystemLoader.php
@@ -12,7 +12,7 @@
  *
  * This loader adds module and theme template paths as namespaces to the Twig
  * filesystem loader so that templates can be referenced by namespace, like
- * @block/block.html.twig or @my_theme/page.html.twig.
+ * "@block/block.html.twig" or "@my_theme/page.html.twig".
  */
 class FilesystemLoader extends TwigFilesystemLoader {
 
diff --git a/core/lib/Drupal/Core/TypedData/DataDefinition.php b/core/lib/Drupal/Core/TypedData/DataDefinition.php
index 3ad36584736821e6a83b6853079b52cbd538248a..48058e33cebae693d13738a1e347bc6736c199d6 100644
--- a/core/lib/Drupal/Core/TypedData/DataDefinition.php
+++ b/core/lib/Drupal/Core/TypedData/DataDefinition.php
@@ -312,6 +312,7 @@ public function addConstraint($constraint_name, $options = NULL) {
    * {@inheritdoc}
    *
    * This is for BC support only.
+   *
    * @todo Remove in https://www.drupal.org/node/1928868.
    */
   public function offsetExists($offset): bool {
@@ -324,6 +325,7 @@ public function offsetExists($offset): bool {
    * {@inheritdoc}
    *
    * This is for BC support only.
+   *
    * @todo Remove in https://www.drupal.org/node/1928868.
    */
   public function &offsetGet($offset): mixed {
@@ -337,6 +339,7 @@ public function &offsetGet($offset): mixed {
    * {@inheritdoc}
    *
    * This is for BC support only.
+   *
    * @todo Remove in https://www.drupal.org/node/1928868.
    */
   public function offsetSet($offset, $value): void {
@@ -347,6 +350,7 @@ public function offsetSet($offset, $value): void {
    * {@inheritdoc}
    *
    * This is for BC support only.
+   *
    * @todo Remove in https://www.drupal.org/node/1928868.
    */
   public function offsetUnset($offset): void {
diff --git a/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestAccessBlock.php b/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestAccessBlock.php
index 6a6bb175b62f3322475e3a6579691f671356af02..7fbb6099ee2f8d27a55c703a6fe1ef4f00ef2993 100644
--- a/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestAccessBlock.php
+++ b/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestAccessBlock.php
@@ -31,7 +31,6 @@ class TestAccessBlock extends BlockBase implements ContainerFactoryPluginInterfa
   /**
    * Tests the test access block.
    *
-   *
    * @param array $configuration
    *   The plugin configuration, i.e. an array with configuration values keyed
    *   by configuration option name. The special key 'context' may be used to
diff --git a/core/modules/block_content/tests/src/Functional/BlockContentRevisionsTest.php b/core/modules/block_content/tests/src/Functional/BlockContentRevisionsTest.php
index a58d770221b4ee3ccd3c6a765be8d8f50b64e43d..2ca1905f914bacaf414355d48e6b340cbc83d88b 100644
--- a/core/modules/block_content/tests/src/Functional/BlockContentRevisionsTest.php
+++ b/core/modules/block_content/tests/src/Functional/BlockContentRevisionsTest.php
@@ -21,12 +21,14 @@ class BlockContentRevisionsTest extends BlockContentTestBase {
 
   /**
    * Stores blocks created during the test.
+   *
    * @var array
    */
   protected $blocks;
 
   /**
    * Stores log messages used during the test.
+   *
    * @var array
    */
   protected $revisionLogs;
diff --git a/core/modules/config/tests/config_test/src/Entity/ConfigQueryTest.php b/core/modules/config/tests/config_test/src/Entity/ConfigQueryTest.php
index 0e36c3d58f93e531bbac867439354584be3597ed..f5b27db255329661c7c2e93c39ca4540d1a7f656 100644
--- a/core/modules/config/tests/config_test/src/Entity/ConfigQueryTest.php
+++ b/core/modules/config/tests/config_test/src/Entity/ConfigQueryTest.php
@@ -13,7 +13,6 @@
 /**
  * Defines the ConfigQueryTest configuration entity used by the query test.
  *
- *
  * @see \Drupal\system\Tests\Entity\ConfigEntityQueryTest
  */
 #[ConfigEntityType(
diff --git a/core/modules/content_moderation/src/Entity/ContentModerationState.php b/core/modules/content_moderation/src/Entity/ContentModerationState.php
index 85ef099318566ce8d4e057aac393a10c88dbfa36..074e9f3cbc6acb4564255443fc2ff5bcc3b999f8 100644
--- a/core/modules/content_moderation/src/Entity/ContentModerationState.php
+++ b/core/modules/content_moderation/src/Entity/ContentModerationState.php
@@ -17,7 +17,6 @@
 /**
  * Defines the Content moderation state entity.
  *
- *
  * @internal
  *   This entity is marked internal because it should not be used directly to
  *   alter the moderation state of an entity. Instead, the computed
diff --git a/core/modules/editor/src/EditorInterface.php b/core/modules/editor/src/EditorInterface.php
index 55ae4a19b6f47c43b4691206fdc6b7ebdd30a277..fe72613a70b70d36a2f45930e96213f6507ceab7 100644
--- a/core/modules/editor/src/EditorInterface.php
+++ b/core/modules/editor/src/EditorInterface.php
@@ -24,6 +24,7 @@ public function hasAssociatedFilterFormat();
    * Returns the filter format this text editor is associated with.
    *
    * This could be NULL if the associated filter format is still being created.
+   *
    * @see hasAssociatedFilterFormat()
    *
    * @return \Drupal\filter\FilterFormatInterface|null
diff --git a/core/modules/editor/tests/src/FunctionalJavascript/EditorAdminTest.php b/core/modules/editor/tests/src/FunctionalJavascript/EditorAdminTest.php
index 9bebf303a558bc0068f6ce0fce40bd7f37cc6d0e..c48eef11ae87044fdf93e8dc20fa42515cb1633d 100644
--- a/core/modules/editor/tests/src/FunctionalJavascript/EditorAdminTest.php
+++ b/core/modules/editor/tests/src/FunctionalJavascript/EditorAdminTest.php
@@ -75,6 +75,7 @@ public function testEditorSelection(): void {
    *
    * The order in which the different editors are selected is significant,
    * because the form state must change accordingly.
+   *
    * @see https://www.drupal.org/project/drupal/issues/3230829
    */
   public function testEditorCreation(): void {
diff --git a/core/modules/field/src/Entity/FieldStorageConfig.php b/core/modules/field/src/Entity/FieldStorageConfig.php
index 609787740268098a8f8391328c7c0949f3f2eb77..b9cca0f1fa23a414c5f0f1681cd8d855815f8b2b 100644
--- a/core/modules/field/src/Entity/FieldStorageConfig.php
+++ b/core/modules/field/src/Entity/FieldStorageConfig.php
@@ -752,6 +752,7 @@ public function hasData() {
    *
    * Using the Serialize interface and serialize() / unserialize() methods
    * breaks entity forms in PHP 5.4.
+   *
    * @todo Investigate in https://www.drupal.org/node/1977206.
    */
   public function __sleep(): array {
diff --git a/core/modules/file/tests/src/Functional/FileFieldFormatterAccessTest.php b/core/modules/file/tests/src/Functional/FileFieldFormatterAccessTest.php
index b928e41f2b12fec1bcfa1455bded46351fbb9458..84c90917f63a051300ecd22b70da96b8e6be0e00 100644
--- a/core/modules/file/tests/src/Functional/FileFieldFormatterAccessTest.php
+++ b/core/modules/file/tests/src/Functional/FileFieldFormatterAccessTest.php
@@ -6,6 +6,7 @@
 
 /**
  * Tests file formatter access.
+ *
  * @group file
  */
 class FileFieldFormatterAccessTest extends FileFieldTestBase {
diff --git a/core/modules/jsonapi/tests/src/Functional/UserTest.php b/core/modules/jsonapi/tests/src/Functional/UserTest.php
index 552f7d05d889bb9d4cc825b33c0e52d7a675b3a3..bbedfecc140ac8195f1c52f94acd006828aa1500 100644
--- a/core/modules/jsonapi/tests/src/Functional/UserTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/UserTest.php
@@ -690,6 +690,7 @@ public function testDeleteRespectsUserCancelBlockUnpublish(): void {
 
   /**
    * Tests if JSON:API respects user.settings.cancel_method: user_cancel_block_unpublish.
+   *
    * @group jsonapi
    */
   public function testDeleteRespectsUserCancelBlockUnpublishAndProcessesBatches(): void {
diff --git a/core/modules/language/tests/src/Kernel/EntityUrlLanguageTest.php b/core/modules/language/tests/src/Kernel/EntityUrlLanguageTest.php
index c904407d97942790447608829dff749a789ce771..47e33a37bf411c0417ee14c4f70b2f17175f4492 100644
--- a/core/modules/language/tests/src/Kernel/EntityUrlLanguageTest.php
+++ b/core/modules/language/tests/src/Kernel/EntityUrlLanguageTest.php
@@ -17,6 +17,7 @@
 
 /**
  * Tests the language of entity URLs.
+ *
  * @group language
  */
 class EntityUrlLanguageTest extends LanguageTestBase {
diff --git a/core/modules/locale/src/StreamWrapper/TranslationsStream.php b/core/modules/locale/src/StreamWrapper/TranslationsStream.php
index e7cb2788e7685a7cda793e784d8b467d7dab502a..dbdb85d2b38fc7d74b507e6d8f8f239d75de9d9c 100644
--- a/core/modules/locale/src/StreamWrapper/TranslationsStream.php
+++ b/core/modules/locale/src/StreamWrapper/TranslationsStream.php
@@ -42,6 +42,7 @@ public function getDirectoryPath() {
 
   /**
    * Implements Drupal\Core\StreamWrapper\StreamWrapperInterface::getExternalUrl().
+   *
    * @throws \LogicException
    *   PO files URL should not be public.
    */
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntityViewMode.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityViewMode.php
index 14cea6058cf49401170acf581792c74dc852d8b0..0909a68227164f18b1bca58d7a193626a22f8bca 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/EntityViewMode.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityViewMode.php
@@ -8,6 +8,7 @@
  * Provides entity view mode destination plugin.
  *
  * See EntityConfigBase for the available configuration options.
+ *
  * @see \Drupal\migrate\Plugin\migrate\destination\EntityConfigBase
  *
  * Example:
diff --git a/core/modules/migrate/tests/src/Unit/process/UrlEncodeTest.php b/core/modules/migrate/tests/src/Unit/process/UrlEncodeTest.php
index c54ff69065ccdfc773144ca42b190e27c65a6279..555b47ae76fc9e13fdeb1f706f03d187060d600f 100644
--- a/core/modules/migrate/tests/src/Unit/process/UrlEncodeTest.php
+++ b/core/modules/migrate/tests/src/Unit/process/UrlEncodeTest.php
@@ -41,6 +41,7 @@ public static function urlDataProvider() {
 
   /**
    * Cover various encoding scenarios.
+   *
    * @dataProvider urlDataProvider
    */
   public function testUrls($input, $output): void {
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/field/d6/UserReference.php b/core/modules/migrate_drupal/src/Plugin/migrate/field/d6/UserReference.php
index 82366a34439b97271b0c2fc03506353ed28bc85f..9b663b5a939982cfcd87655f4ceef46331991a63 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/field/d6/UserReference.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/field/d6/UserReference.php
@@ -10,6 +10,7 @@
 
 /**
  * MigrateField Plugin for Drupal 6 user reference fields.
+ *
  * @internal
  */
 #[MigrateField(
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d7/FieldableEntity.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/d7/FieldableEntity.php
index 2a639219a00eccc1309cb8b06592ff7a55673282..89b92a6af38849ba983d04f8341a1bb71b932206 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d7/FieldableEntity.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/d7/FieldableEntity.php
@@ -10,6 +10,7 @@
  * Field values are collected from the Field API.
  *
  * Refer to the existing implementations for examples:
+ *
  * @see \Drupal\node\Plugin\migrate\source\d7\Node
  * @see \Drupal\user\Plugin\migrate\source\d7\User
  *
diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeIso8601NormalizerTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeIso8601NormalizerTest.php
index a6089b3a31a649831f8cd149294e6a5de6cc6fbb..59b01a1bbbd4c0530ec8d90c494770814fd699e5 100644
--- a/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeIso8601NormalizerTest.php
+++ b/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeIso8601NormalizerTest.php
@@ -262,6 +262,7 @@ public function testDenormalizeNoTargetInstanceOrFieldDefinitionException(): voi
  *
  * Note: Prophecy does not support magic methods. By subclassing and specifying
  * an explicit method, Prophecy works.
+ *
  * @see https://github.com/phpspec/prophecy/issues/338
  * @see https://github.com/phpspec/prophecy/issues/34
  * @see https://github.com/phpspec/prophecy/issues/80
diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeNormalizerTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeNormalizerTest.php
index 2091f0279b6f5bc69e45faa519f509d33212db9b..f12d82eaf1665354935a4c75f8b4763df138df9e 100644
--- a/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeNormalizerTest.php
+++ b/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeNormalizerTest.php
@@ -184,6 +184,7 @@ public function testDenormalizeException(): void {
  *
  * Note: Prophecy does not support magic methods. By subclassing and specifying
  * an explicit method, Prophecy works.
+ *
  * @see https://github.com/phpspec/prophecy/issues/338
  * @see https://github.com/phpspec/prophecy/issues/34
  * @see https://github.com/phpspec/prophecy/issues/80
diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/TimestampNormalizerTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/TimestampNormalizerTest.php
index f5a172096ddc919c5feca33d78ce43f6a3db5078..398e458f4eb06f100c1d223715a42436dce7e9d9 100644
--- a/core/modules/serialization/tests/src/Unit/Normalizer/TimestampNormalizerTest.php
+++ b/core/modules/serialization/tests/src/Unit/Normalizer/TimestampNormalizerTest.php
@@ -139,6 +139,7 @@ public function testDenormalizeException(): void {
  *
  * Note: Prophecy does not support magic methods. By subclassing and specifying
  * an explicit method, Prophecy works.
+ *
  * @see https://github.com/phpspec/prophecy/issues/338
  * @see https://github.com/phpspec/prophecy/issues/34
  * @see https://github.com/phpspec/prophecy/issues/80
diff --git a/core/modules/sqlite/src/Driver/Database/sqlite/Install/Tasks.php b/core/modules/sqlite/src/Driver/Database/sqlite/Install/Tasks.php
index 050dd2c3ceb6be4f4bfc37fc244a83c9d3a4b7c0..c03e6226d2c4801f43ac06d0d6705be0ad60c034 100644
--- a/core/modules/sqlite/src/Driver/Database/sqlite/Install/Tasks.php
+++ b/core/modules/sqlite/src/Driver/Database/sqlite/Install/Tasks.php
@@ -16,6 +16,7 @@ class Tasks extends InstallTasks {
    * Minimum required SQLite version.
    *
    * Use to build sqlite library with json1 option for JSON datatype support.
+   *
    * @see https://www.sqlite.org/json1.html
    */
   const SQLITE_MINIMUM_VERSION = '3.45';
diff --git a/core/modules/system/tests/modules/nightwatch_theme_install_utility/src/Controller/ThemeInstallController.php b/core/modules/system/tests/modules/nightwatch_theme_install_utility/src/Controller/ThemeInstallController.php
index 93614cbfb4414d47f31a48761288c47c5283c874..68a6429c6023491fe514be5b3cae4ba067a3cb90 100644
--- a/core/modules/system/tests/modules/nightwatch_theme_install_utility/src/Controller/ThemeInstallController.php
+++ b/core/modules/system/tests/modules/nightwatch_theme_install_utility/src/Controller/ThemeInstallController.php
@@ -59,6 +59,7 @@ public function installDefault(string $theme) {
 
   /**
    * Install a theme as the admin theme.
+   *
    * @param string $theme
    *   The theme to install as the admin theme.
    *
diff --git a/core/modules/system/tests/src/Kernel/Module/RequirementsTest.php b/core/modules/system/tests/src/Kernel/Module/RequirementsTest.php
index 9deed82b828ec2523db83b3f4a6626a9946072a8..2258b08bc4949732ce1e1a42a0f27834663516b0 100644
--- a/core/modules/system/tests/src/Kernel/Module/RequirementsTest.php
+++ b/core/modules/system/tests/src/Kernel/Module/RequirementsTest.php
@@ -8,6 +8,7 @@
 
 /**
  * Covers hook_requirements and hook_requirements_alter.
+ *
  * @group Module
  */
 class RequirementsTest extends KernelTestBase {
diff --git a/core/modules/user/src/Controller/UserAuthenticationController.php b/core/modules/user/src/Controller/UserAuthenticationController.php
index af31a878ddcc957bbd2581bf257ab38703c0fbd4..39a79cbcf5dcde73e73c31709e11e9105a98b07b 100644
--- a/core/modules/user/src/Controller/UserAuthenticationController.php
+++ b/core/modules/user/src/Controller/UserAuthenticationController.php
@@ -62,6 +62,7 @@ class UserAuthenticationController extends ControllerBase implements ContainerIn
 
   /**
    * The user authentication.
+   *
    * @var \Drupal\user\UserAuthInterface|\Drupal\user\UserAuthenticationInterface
    */
   protected $userAuth;
diff --git a/core/modules/user/src/Plugin/migrate/destination/EntityUser.php b/core/modules/user/src/Plugin/migrate/destination/EntityUser.php
index 18ff32256eea96c011639df3a2748036acaae783..e66ec9ee6a66e815a8f81680f18510485c3aa91c 100644
--- a/core/modules/user/src/Plugin/migrate/destination/EntityUser.php
+++ b/core/modules/user/src/Plugin/migrate/destination/EntityUser.php
@@ -123,6 +123,7 @@ public static function create(ContainerInterface $container, array $configuratio
 
   /**
    * {@inheritdoc}
+   *
    * @throws \Drupal\migrate\MigrateException
    */
   public function import(Row $row, array $old_destination_id_values = []) {
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 907fa44f56c92999a4485aaff462de1349cf9d01..a22c79094daa9e0d86b7b9ee74a9598141a3cd9f 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -387,6 +387,7 @@ function user_cancel($edit, $uid, $method) {
  *
  * Since batch and session API require a valid user account, the actual
  * cancellation of a user account needs to happen last.
+ *
  * @param array $edit
  *   An array of submitted form values.
  * @param \Drupal\user\UserInterface $account
diff --git a/core/modules/views/src/EventSubscriber/RouteSubscriber.php b/core/modules/views/src/EventSubscriber/RouteSubscriber.php
index 7cc6d56183ee807b155d3d077cd263414ffb52e5..7a9d9b89f205aa021ebf2846f4284534a61916b5 100644
--- a/core/modules/views/src/EventSubscriber/RouteSubscriber.php
+++ b/core/modules/views/src/EventSubscriber/RouteSubscriber.php
@@ -18,7 +18,6 @@
  * routes are overridden by views. This information is used to determine which
  * views have to be added by views in the dynamic event.
  *
- *
  * @see \Drupal\views\Plugin\views\display\PathPluginBase
  */
 class RouteSubscriber extends RouteSubscriberBase {
diff --git a/core/modules/views/src/Plugin/views/access/AccessPluginBase.php b/core/modules/views/src/Plugin/views/access/AccessPluginBase.php
index 9469cc361a5b76456fdc8132438655304b5b7ffa..c1a39114691e0ecbe55dafeb2cbb65fcf033d0e5 100644
--- a/core/modules/views/src/Plugin/views/access/AccessPluginBase.php
+++ b/core/modules/views/src/Plugin/views/access/AccessPluginBase.php
@@ -31,11 +31,14 @@
  * To define an access control plugin, extend this base class. Your access
  * plugin should have an annotation that includes the plugin's metadata, for
  * example:
+ * @code
  * @Plugin(
  *   id = "deny_all",
  *   title = @Translation("No Access"),
  *   help = @Translation("Will not be accessible.")
  * )
+ * @endcode
+ *
  * The definition should include the following keys:
  * - id: The unique identifier of your access plugin.
  * - title: The human-readable name for your access plugin.
diff --git a/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php b/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
index 3279a33d6e534011a182eb384fd297eb2f996da7..e855bd577af3280e4166e653b8d0e7d725bcb112 100644
--- a/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
+++ b/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
@@ -72,6 +72,7 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
 
   /**
    * The table to use for the name, should it not be in the same table as the argument.
+   *
    * @var string
    */
   // phpcs:ignore Drupal.NamingConventions.ValidVariableName.LowerCamelName, Drupal.Commenting.VariableComment.Missing
diff --git a/core/modules/views/src/Plugin/views/argument/NumericArgument.php b/core/modules/views/src/Plugin/views/argument/NumericArgument.php
index 39bb662ec7980fd3ec16989a8a86d4ebc8039fcc..8d16ed8a0f3eb29265d76f99b5b08360f1cf8bc6 100644
--- a/core/modules/views/src/Plugin/views/argument/NumericArgument.php
+++ b/core/modules/views/src/Plugin/views/argument/NumericArgument.php
@@ -20,6 +20,7 @@ class NumericArgument extends ArgumentPluginBase {
 
   /**
    * The actual value which is used for querying.
+   *
    * @var array
    */
   public $value;
@@ -82,6 +83,7 @@ public function title() {
 
   /**
    * Override for specific title lookups.
+   *
    * @return array
    *   Returns all titles, if it's just one title it's an array with one entry.
    */
diff --git a/core/modules/views/src/Plugin/views/field/MachineName.php b/core/modules/views/src/Plugin/views/field/MachineName.php
index 216863fbb978675125175f0c91ba42adf4acef4d..698fa80a7202477a0a1cceba8db0c1c81fd04668 100644
--- a/core/modules/views/src/Plugin/views/field/MachineName.php
+++ b/core/modules/views/src/Plugin/views/field/MachineName.php
@@ -8,6 +8,7 @@
 
 /**
  * Field handler which allows to show machine name content as human name.
+ *
  * @ingroup views_field_handlers
  *
  * Definition items:
diff --git a/core/modules/views/src/Plugin/views/style/Table.php b/core/modules/views/src/Plugin/views/style/Table.php
index 62be3f85d478f17c03f184d88cec63234680681d..56d6b0324260379f71c5c31c1d4baac4bf564a6d 100644
--- a/core/modules/views/src/Plugin/views/style/Table.php
+++ b/core/modules/views/src/Plugin/views/style/Table.php
@@ -52,12 +52,14 @@ class Table extends StylePluginBase implements CacheableDependencyInterface {
 
   /**
    * Contains the current active sort column.
+   *
    * @var string
    */
   public $active;
 
   /**
    * Contains the current active sort order, either desc or asc.
+   *
    * @var string
    */
   public $order;
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 39f75d81bcc633bb8d8b22289bf365c827148030..da78f3435edc986b8d815ccf4fc76022682815b6 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -60,7 +60,6 @@
     <exclude name="Drupal.Commenting.DocComment.MissingShort"/>
     <exclude name="Drupal.Commenting.DocComment.ParamNotFirst"/>
     <exclude name="Drupal.Commenting.DocComment.ShortNotCapital"/>
-    <exclude name="Drupal.Commenting.DocComment.SpacingBeforeTags"/>
   </rule>
   <rule ref="Drupal.Commenting.DocCommentAlignment"/>
   <rule ref="Drupal.Commenting.DocCommentLongArraySyntax"/>
diff --git a/core/tests/Drupal/FunctionalTests/Installer/InstallerNonDefaultDatabaseDriverTest.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerNonDefaultDatabaseDriverTest.php
index a86621f83a24a8ccffc3f1cbeca190717af47ebc..cf8fb43c43fc2e6ff51a5b7e71b31986c653e297 100644
--- a/core/tests/Drupal/FunctionalTests/Installer/InstallerNonDefaultDatabaseDriverTest.php
+++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerNonDefaultDatabaseDriverTest.php
@@ -25,6 +25,7 @@ class InstallerNonDefaultDatabaseDriverTest extends InstallerTestBase {
 
   /**
    * The name of the test database driver in use.
+   *
    * @var string
    */
   protected $testDriverName;
diff --git a/core/tests/Drupal/KernelTests/Core/DrupalKernel/DrupalKernelTest.php b/core/tests/Drupal/KernelTests/Core/DrupalKernel/DrupalKernelTest.php
index f5deb5e33e914b590c981f0443a0a79d7ae8a8c7..f81f5ab6a56377b3f72360766b59a9c6649c4c1c 100644
--- a/core/tests/Drupal/KernelTests/Core/DrupalKernel/DrupalKernelTest.php
+++ b/core/tests/Drupal/KernelTests/Core/DrupalKernel/DrupalKernelTest.php
@@ -203,6 +203,7 @@ public function testPreventChangeOfSitePath(): void {
 
   /**
    * Data provider for self::testClassLoaderAutoDetect.
+   *
    * @return array
    */
   public static function providerClassLoaderAutoDetect() {
diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
index 6d179de5c4b62439fcf39b1019c0696232f0e5df..c3370af5b305f682cd628acea4f06294a33e06ed 100644
--- a/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
+++ b/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
@@ -238,6 +238,7 @@ public function testHasForAliasedService(): void {
 
   /**
    * Tests that Container::get() for circular dependencies works properly.
+   *
    * @covers ::get
    * @covers ::createService
    */
@@ -357,6 +358,7 @@ public function testGetForNonExistentServiceWhenUsingNull(): void {
 
   /**
    * Tests that Container::get() for NULL service works properly.
+   *
    * @covers ::get
    * @covers ::createService
    */
diff --git a/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php b/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php
index 5d769d0b194389a46285f768ff05ef455549028e..e2fea54aeb131c3c02c3f4934fa6e3e5c1baac3a 100644
--- a/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php
+++ b/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php
@@ -74,6 +74,7 @@ public function testCRUD(): void {
    * mtime too.
    *
    * We need to delay over 1 second for mtime test.
+   *
    * @medium
    */
   public function testSecurity(): void {
diff --git a/core/tests/Drupal/Tests/Core/Cache/CacheCollectorHelper.php b/core/tests/Drupal/Tests/Core/Cache/CacheCollectorHelper.php
index edbe5107724be222d509222842a1cb747cdfdaa0..0409b932626d9f3ac17fc62c0240d5b7159a09ae 100644
--- a/core/tests/Drupal/Tests/Core/Cache/CacheCollectorHelper.php
+++ b/core/tests/Drupal/Tests/Core/Cache/CacheCollectorHelper.php
@@ -13,6 +13,7 @@ class CacheCollectorHelper extends CacheCollector {
 
   /**
    * Contains data to return on a cache miss.
+   *
    * @var array
    */
   protected $cacheMissData = [];
diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php
index 1560d4671411ed4fed8e61051b8f54b6b311157f..b5d263a74aa22561d19993629f253f23f336a714 100644
--- a/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php
+++ b/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php
@@ -69,6 +69,7 @@ class CustomPageExceptionHtmlSubscriberTest extends UnitTestCase {
 
   /**
    * The mocked access unaware router.
+   *
    * @var \Symfony\Component\Routing\Matcher\UrlMatcherInterface|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $accessUnawareRouter;
diff --git a/core/tests/Drupal/Tests/Core/Lock/LockBackendAbstractTest.php b/core/tests/Drupal/Tests/Core/Lock/LockBackendAbstractTest.php
index bdf7084e78ec4b6c0a4e2163535a9b207eb802c8..8d70c114482767eaeb123056de7cad378ea7fd0f 100644
--- a/core/tests/Drupal/Tests/Core/Lock/LockBackendAbstractTest.php
+++ b/core/tests/Drupal/Tests/Core/Lock/LockBackendAbstractTest.php
@@ -46,6 +46,7 @@ public function testWaitFalse(): void {
    * Tests the wait() method when lockMayBeAvailable() returns FALSE.
    *
    * Waiting could take 1 second so we need to extend the possible runtime.
+   *
    * @medium
    */
   public function testWaitTrue(): void {
diff --git a/core/tests/Drupal/Tests/Core/Path/PathValidatorTest.php b/core/tests/Drupal/Tests/Core/Path/PathValidatorTest.php
index 1f80c6f6cd6adea9628ec541a062e7ffc576b7c7..dea2b1113db4c8770cded9bd9bb4299f79228707 100644
--- a/core/tests/Drupal/Tests/Core/Path/PathValidatorTest.php
+++ b/core/tests/Drupal/Tests/Core/Path/PathValidatorTest.php
@@ -28,6 +28,7 @@ class PathValidatorTest extends UnitTestCase {
 
   /**
    * The mocked access unaware router.
+   *
    * @var \Symfony\Component\Routing\Matcher\UrlMatcherInterface|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $accessUnawareRouter;
diff --git a/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscoveryWithObject.php b/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscoveryWithObject.php
index 5142ad81adb12ab3317f8fb9080ca96761ffb09e..bd6f9c036563748c62cc593d33ba7390bbedfe30 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscoveryWithObject.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscoveryWithObject.php
@@ -13,12 +13,6 @@ class TestDerivativeDiscoveryWithObject implements DeriverInterface {
 
   /**
    * {@inheritdoc}
-   * @param string $derivative_id
-   *   The ID for the derivative.
-   * @param array $base_plugin_definition
-   *   An associative array defining the base plugin.
-   *
-   * @return array
    */
   public function getDerivativeDefinition($derivative_id, $base_plugin_definition) {
     $definitions = $this->getDerivativeDefinitions($base_plugin_definition);
@@ -27,10 +21,6 @@ public function getDerivativeDefinition($derivative_id, $base_plugin_definition)
 
   /**
    * {@inheritdoc}
-   * @param array $base_plugin_definition
-   *   An associative array defining the base plugin.
-   *
-   * @return array
    */
   public function getDerivativeDefinitions($base_plugin_definition) {
     $plugins = [];
diff --git a/core/tests/Drupal/Tests/Core/StringTranslation/TranslationManagerTest.php b/core/tests/Drupal/Tests/Core/StringTranslation/TranslationManagerTest.php
index 70d0a96e7a30d352f0b571c71020e959f693e735..51b3082d944f91ae1e69d2cfb81d0889d3688313 100644
--- a/core/tests/Drupal/Tests/Core/StringTranslation/TranslationManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/StringTranslation/TranslationManagerTest.php
@@ -32,6 +32,7 @@ protected function setUp(): void {
 
   /**
    * Provides some test data for formatPlural()
+   *
    * @return array
    */
   public static function providerTestFormatPlural() {
diff --git a/core/tests/Drupal/Tests/Core/Template/AttributeTest.php b/core/tests/Drupal/Tests/Core/Template/AttributeTest.php
index 8cf07c7cffd9ab4af94b34cea917c54d037a7ae8..8f011b46f662a62a452c1095a530f85b2c7564c0 100644
--- a/core/tests/Drupal/Tests/Core/Template/AttributeTest.php
+++ b/core/tests/Drupal/Tests/Core/Template/AttributeTest.php
@@ -78,6 +78,7 @@ public function testRemove(): void {
 
   /**
    * Tests setting attributes.
+   *
    * @covers ::setAttribute
    */
   public function testSetAttribute(): void {
@@ -106,6 +107,7 @@ public function testSetAttribute(): void {
 
   /**
    * Tests removing attributes.
+   *
    * @covers ::removeAttribute
    */
   public function testRemoveAttribute(): void {
@@ -145,6 +147,7 @@ public function testRemoveAttribute(): void {
 
   /**
    * Tests adding class attributes with the AttributeArray helper method.
+   *
    * @covers ::addClass
    */
   public function testAddClasses(): void {
@@ -201,6 +204,7 @@ public function testAddClasses(): void {
 
   /**
    * Tests removing class attributes with the AttributeArray helper method.
+   *
    * @covers ::removeClass
    */
   public function testRemoveClasses(): void {
@@ -232,6 +236,7 @@ public function testRemoveClasses(): void {
 
   /**
    * Tests checking for class names with the Attribute method.
+   *
    * @covers ::hasClass
    */
   public function testHasClass(): void {
@@ -247,6 +252,7 @@ public function testHasClass(): void {
 
   /**
    * Tests removing class attributes with the Attribute helper methods.
+   *
    * @covers ::removeClass
    * @covers ::addClass
    */
@@ -265,6 +271,7 @@ public function testChainAddRemoveClasses(): void {
 
   /**
    * Tests the twig calls to the Attribute.
+   *
    * @dataProvider providerTestAttributeClassHelpers
    *
    * @covers ::removeClass
diff --git a/core/tests/Drupal/Tests/Core/Test/JUnitConverterTest.php b/core/tests/Drupal/Tests/Core/Test/JUnitConverterTest.php
index 49599b0e4ae99b0d5871c67655b9f32699471716..0366ab068ca54369650d9f62c5a96f0706020d6d 100644
--- a/core/tests/Drupal/Tests/Core/Test/JUnitConverterTest.php
+++ b/core/tests/Drupal/Tests/Core/Test/JUnitConverterTest.php
@@ -25,6 +25,7 @@ class JUnitConverterTest extends UnitTestCase {
 
   /**
    * Tests errors reported.
+   *
    * @covers ::xmlToRows
    */
   public function testXmlToRowsWithErrors(): void {