diff --git a/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php b/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php
index 1fd808c17f7bd1ceae968a33b0d8836e8e51b4c7..2e790eea0417e35045526f91028ca82869c230e7 100644
--- a/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php
+++ b/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php
@@ -36,7 +36,7 @@ class ContainerAwareEventDispatcher implements EventDispatcherInterface {
   /**
    * The service container.
    *
-   * @var \Symfony\Component\DependencyInjection\ContainerInterface;
+   * @var \Symfony\Component\DependencyInjection\ContainerInterface
    */
   protected $container;
 
diff --git a/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php b/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php
index cc968825ad6228537fdd55b9a93475fbf9eb1e75..d784cdb2c5f67e3369832e28a89a79f3b57f4db4 100644
--- a/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php
+++ b/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php
@@ -28,7 +28,7 @@ class QueryFactory implements QueryFactoryInterface, EventSubscriberInterface {
   /**
    * The config factory used by the config entity query.
    *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface;
+   * @var \Drupal\Core\Config\ConfigFactoryInterface
    */
   protected $configFactory;
 
diff --git a/core/lib/Drupal/Core/Controller/HtmlFormController.php b/core/lib/Drupal/Core/Controller/HtmlFormController.php
index 16bcc58537944f82fc61255138f4f5d9796e6add..6dd27ee1e1d97a58f042ea36bfaa421a3d65e9ed 100644
--- a/core/lib/Drupal/Core/Controller/HtmlFormController.php
+++ b/core/lib/Drupal/Core/Controller/HtmlFormController.php
@@ -15,7 +15,7 @@ class HtmlFormController extends FormController {
   /**
    * The class resolver.
    *
-   * @var \Drupal\Core\DependencyInjection\ClassResolverInterface;
+   * @var \Drupal\Core\DependencyInjection\ClassResolverInterface
    */
   protected $classResolver;
 
diff --git a/core/lib/Drupal/Core/Form/EnforcedResponse.php b/core/lib/Drupal/Core/Form/EnforcedResponse.php
index 2b1466d0a3cc027a60d160a0ed69b6317a9eec4e..46dfdca6f1cc3a4a77e9517f82eb3782aad14c65 100644
--- a/core/lib/Drupal/Core/Form/EnforcedResponse.php
+++ b/core/lib/Drupal/Core/Form/EnforcedResponse.php
@@ -23,7 +23,7 @@ class EnforcedResponse extends Response {
   /**
    * The wrapped response object.
    *
-   * @var \Symfony\Component\HttpFoundation\Response;
+   * @var \Symfony\Component\HttpFoundation\Response
    */
   protected $response;
 
diff --git a/core/lib/Drupal/Core/Path/AliasManager.php b/core/lib/Drupal/Core/Path/AliasManager.php
index 6773e79835188570f2faebae284a94ff9e0321d5..39472797ad64d40a4d18c0c21901f7f9464ed13e 100644
--- a/core/lib/Drupal/Core/Path/AliasManager.php
+++ b/core/lib/Drupal/Core/Path/AliasManager.php
@@ -22,7 +22,7 @@ class AliasManager implements AliasManagerInterface, CacheDecoratorInterface {
   /**
    * Cache backend service.
    *
-   * @var \Drupal\Core\Cache\CacheBackendInterface;
+   * @var \Drupal\Core\Cache\CacheBackendInterface
    */
   protected $cache;
 
diff --git a/core/lib/Drupal/Core/Routing/AccessAwareRouter.php b/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
index d8487c6ef92feb7714f0651f81a39d857b31b5a1..8f9e7beb296a492c5afdab48d27f947f519a637d 100644
--- a/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
+++ b/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
@@ -34,7 +34,7 @@ class AccessAwareRouter implements AccessAwareRouterInterface {
   /**
    * The account to use in access checks.
    *
-   * @var \Drupal\Core\Session\AccountInterface;
+   * @var \Drupal\Core\Session\AccountInterface
    */
   protected $account;
 
diff --git a/core/lib/Drupal/Core/Session/UserSession.php b/core/lib/Drupal/Core/Session/UserSession.php
index f426803cebf1eb87c411873a2c30923928f82a17..3fdf94ceaafa8dbe172a1789556aee609920d64a 100644
--- a/core/lib/Drupal/Core/Session/UserSession.php
+++ b/core/lib/Drupal/Core/Session/UserSession.php
@@ -28,7 +28,7 @@ class UserSession implements AccountInterface {
   /**
    * The Unix timestamp when the user last accessed the site.
    *
-   * @var string.
+   * @var string
    */
   protected $access;
 
diff --git a/core/modules/automated_cron/src/EventSubscriber/AutomatedCron.php b/core/modules/automated_cron/src/EventSubscriber/AutomatedCron.php
index b6aefcd71b1ccea02598bb30db9ca174284aee79..8fe6f8ca5a4a34990596dcb39dde5865b028dc87 100644
--- a/core/modules/automated_cron/src/EventSubscriber/AutomatedCron.php
+++ b/core/modules/automated_cron/src/EventSubscriber/AutomatedCron.php
@@ -31,7 +31,7 @@ class AutomatedCron implements EventSubscriberInterface {
   /**
    * The state key value store.
    *
-   * @var \Drupal\Core\State\StateInterface;
+   * @var \Drupal\Core\State\StateInterface
    */
   protected $state;
 
diff --git a/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php b/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php
index 2a7c7710c3093fa947e35760af1f730757fc4355..cfe9d1b0d8895dfaf65da5c674e34fcec1eeb6db 100644
--- a/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php
+++ b/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php
@@ -26,7 +26,7 @@ class BlockStorageUnitTest extends KernelTestBase {
   /**
    * The block storage.
    *
-   * @var \Drupal\Core\Config\Entity\ConfigEntityStorageInterface.
+   * @var \Drupal\Core\Config\Entity\ConfigEntityStorageInterface
    */
   protected $controller;
 
diff --git a/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php b/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
index 54f7ad58e1d3fde8fb119937f1c51b8053f7508b..6ca88d198a89757a8dab99366f8bd6f6c6ca69da 100644
--- a/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
+++ b/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
@@ -29,7 +29,7 @@ class BlockContentBlock extends BlockBase implements ContainerFactoryPluginInter
   /**
    * The Plugin Block Manager.
    *
-   * @var \Drupal\Core\Block\BlockManagerInterface.
+   * @var \Drupal\Core\Block\BlockManagerInterface
    */
   protected $blockManager;
 
@@ -43,7 +43,7 @@ class BlockContentBlock extends BlockBase implements ContainerFactoryPluginInter
   /**
    * The Drupal account to use for checking for access to block.
    *
-   * @var \Drupal\Core\Session\AccountInterface.
+   * @var \Drupal\Core\Session\AccountInterface
    */
   protected $account;
 
diff --git a/core/modules/ckeditor/tests/src/Kernel/CKEditorTest.php b/core/modules/ckeditor/tests/src/Kernel/CKEditorTest.php
index de4c23fe839e97b63032e0f7e6468f4c411c086d..6ff5d20e6a60aafd1f55bfc2229101faee18ba48 100644
--- a/core/modules/ckeditor/tests/src/Kernel/CKEditorTest.php
+++ b/core/modules/ckeditor/tests/src/Kernel/CKEditorTest.php
@@ -24,7 +24,7 @@ class CKEditorTest extends KernelTestBase {
   /**
    * An instance of the "CKEditor" text editor plugin.
    *
-   * @var \Drupal\ckeditor\Plugin\Editor\CKEditor;
+   * @var \Drupal\ckeditor\Plugin\Editor\CKEditor
    */
   protected $ckeditor;
 
diff --git a/core/modules/comment/src/CommentForm.php b/core/modules/comment/src/CommentForm.php
index 2c7da35b248cd60c65c6e409809db30ebec78d48..c3ade475992950ba7c1ae68e59334852c430c0bb 100644
--- a/core/modules/comment/src/CommentForm.php
+++ b/core/modules/comment/src/CommentForm.php
@@ -41,7 +41,7 @@ class CommentForm extends ContentEntityForm {
   /**
    * The entity field manager.
    *
-   * @var \Drupal\Core\Entity\EntityFieldManagerInterface;
+   * @var \Drupal\Core\Entity\EntityFieldManagerInterface
    */
   protected $entityFieldManager;
 
diff --git a/core/modules/comment/tests/src/Unit/CommentLinkBuilderTest.php b/core/modules/comment/tests/src/Unit/CommentLinkBuilderTest.php
index e2ddf8ab0eee4823f28c735805337cd2414ee202..48db158f612ac4b6af4362ea42ea8c9720e4ffcc 100644
--- a/core/modules/comment/tests/src/Unit/CommentLinkBuilderTest.php
+++ b/core/modules/comment/tests/src/Unit/CommentLinkBuilderTest.php
@@ -60,7 +60,7 @@ class CommentLinkBuilderTest extends UnitTestCase {
   protected $timestamp;
 
   /**
-   * @var \Drupal\comment\CommentLinkBuilderInterface;
+   * @var \Drupal\comment\CommentLinkBuilderInterface
    */
   protected $commentLinkBuilder;
 
diff --git a/core/modules/config/src/Form/ConfigSingleImportForm.php b/core/modules/config/src/Form/ConfigSingleImportForm.php
index 560f124c840dd8db6f73c34cd2972c1e0a563fb9..83e776c0b0c12a9bb6212cae9db8ef5217c6f54f 100644
--- a/core/modules/config/src/Form/ConfigSingleImportForm.php
+++ b/core/modules/config/src/Form/ConfigSingleImportForm.php
@@ -62,7 +62,7 @@ class ConfigSingleImportForm extends ConfirmFormBase {
   /**
    * The configuration manager.
    *
-   * @var \Drupal\Core\Config\ConfigManagerInterface;
+   * @var \Drupal\Core\Config\ConfigManagerInterface
    */
   protected $configManager;
 
diff --git a/core/modules/config/src/Form/ConfigSync.php b/core/modules/config/src/Form/ConfigSync.php
index 475c4a4a63796e925daf661bfcc58d55e5a71ecc..44034ddabb38dd70c56a76a7ceeb411b811bd558 100644
--- a/core/modules/config/src/Form/ConfigSync.php
+++ b/core/modules/config/src/Form/ConfigSync.php
@@ -64,7 +64,7 @@ class ConfigSync extends FormBase {
   /**
    * The configuration manager.
    *
-   * @var \Drupal\Core\Config\ConfigManagerInterface;
+   * @var \Drupal\Core\Config\ConfigManagerInterface
    */
   protected $configManager;
 
diff --git a/core/modules/contact/src/Access/ContactPageAccess.php b/core/modules/contact/src/Access/ContactPageAccess.php
index 40307537cae2ced854e8a3bd2ca4b9b4573b95e5..2038357962719eaa452217f82dd5a4b129d14787 100644
--- a/core/modules/contact/src/Access/ContactPageAccess.php
+++ b/core/modules/contact/src/Access/ContactPageAccess.php
@@ -24,7 +24,7 @@ class ContactPageAccess implements AccessInterface {
   /**
    * The user data service.
    *
-   * @var \Drupal\user\UserDataInterface;
+   * @var \Drupal\user\UserDataInterface
    */
   protected $userData;
 
diff --git a/core/modules/content_moderation/tests/src/Kernel/ContentModerationWorkflowTypeApiTest.php b/core/modules/content_moderation/tests/src/Kernel/ContentModerationWorkflowTypeApiTest.php
index e10756cf562f3a94f05011da7ef65317c626ac14..7c0e2fca953333f833babdaeb4084c3f9b1dd11f 100644
--- a/core/modules/content_moderation/tests/src/Kernel/ContentModerationWorkflowTypeApiTest.php
+++ b/core/modules/content_moderation/tests/src/Kernel/ContentModerationWorkflowTypeApiTest.php
@@ -17,7 +17,7 @@ class ContentModerationWorkflowTypeApiTest extends KernelTestBase {
   /**
    * A workflow for testing.
    *
-   * @var \Drupal\workflows\Entity\Workflow;
+   * @var \Drupal\workflows\Entity\Workflow
    */
   protected $workflow;
 
diff --git a/core/modules/editor/tests/src/Kernel/QuickEditIntegrationTest.php b/core/modules/editor/tests/src/Kernel/QuickEditIntegrationTest.php
index 16c0773e7c94345a12ee3ef796459b60b3b7c6bd..1801cc84822f22599a9c65b1220a11487c016940 100644
--- a/core/modules/editor/tests/src/Kernel/QuickEditIntegrationTest.php
+++ b/core/modules/editor/tests/src/Kernel/QuickEditIntegrationTest.php
@@ -38,7 +38,7 @@ class QuickEditIntegrationTest extends QuickEditTestBase {
   /**
    * The metadata generator object to be tested.
    *
-   * @var \Drupal\quickedit\MetadataGeneratorInterface.php
+   * @var \Drupal\quickedit\MetadataGeneratorInterface
    */
   protected $metadataGenerator;
 
diff --git a/core/modules/field/tests/src/Functional/FieldHelpTest.php b/core/modules/field/tests/src/Functional/FieldHelpTest.php
index 9a6ff6782099c65edb2a495e8a97468647aab8e6..712edec99acf192cd505e23693b3b44465a1aaf1 100644
--- a/core/modules/field/tests/src/Functional/FieldHelpTest.php
+++ b/core/modules/field/tests/src/Functional/FieldHelpTest.php
@@ -14,7 +14,7 @@ class FieldHelpTest extends BrowserTestBase {
   /**
    * Modules to enable.
    *
-   * @var array.
+   * @var array
    */
   public static $modules = ['field', 'help'];
 
diff --git a/core/modules/field/tests/src/Kernel/ConfigFieldDefinitionTest.php b/core/modules/field/tests/src/Kernel/ConfigFieldDefinitionTest.php
index 1e5e072c5929c8a0c56814c6c99d139d18af80cf..a2a2c21d1e6b836658b4c9e33290ae7d6a3900fb 100644
--- a/core/modules/field/tests/src/Kernel/ConfigFieldDefinitionTest.php
+++ b/core/modules/field/tests/src/Kernel/ConfigFieldDefinitionTest.php
@@ -15,7 +15,7 @@ class ConfigFieldDefinitionTest extends FieldKernelTestBase {
   /**
    * The entity manager service.
    *
-   * @var \Drupal\Core\Entity\EntityManagerInterface;
+   * @var \Drupal\Core\Entity\EntityManagerInterface
    */
   protected $entityManager;
 
diff --git a/core/modules/hal/src/LinkManager/RelationLinkManager.php b/core/modules/hal/src/LinkManager/RelationLinkManager.php
index 803da7b45fa730950d0bdaa483c25176a7ef1cdd..cf858c700898e45ff46b2fd3b4759b2740c94bb3 100644
--- a/core/modules/hal/src/LinkManager/RelationLinkManager.php
+++ b/core/modules/hal/src/LinkManager/RelationLinkManager.php
@@ -13,7 +13,7 @@
 class RelationLinkManager extends LinkManagerBase implements RelationLinkManagerInterface {
 
   /**
-   * @var \Drupal\Core\Cache\CacheBackendInterface;
+   * @var \Drupal\Core\Cache\CacheBackendInterface
    */
   protected $cache;
 
diff --git a/core/modules/hal/src/LinkManager/TypeLinkManager.php b/core/modules/hal/src/LinkManager/TypeLinkManager.php
index 8145350144b187d9244c9a00f31d3b5b2be3b73e..62be23d2bca04b1b644579b29da207b5362a3ef1 100644
--- a/core/modules/hal/src/LinkManager/TypeLinkManager.php
+++ b/core/modules/hal/src/LinkManager/TypeLinkManager.php
@@ -14,7 +14,7 @@ class TypeLinkManager extends LinkManagerBase implements TypeLinkManagerInterfac
   /**
    * Injected cache backend.
    *
-   * @var \Drupal\Core\Cache\CacheBackendInterface;
+   * @var \Drupal\Core\Cache\CacheBackendInterface
    */
   protected $cache;
 
diff --git a/core/modules/help/tests/src/Functional/HelpTest.php b/core/modules/help/tests/src/Functional/HelpTest.php
index dff11ef173c6366c42130a51ef34c11ff3522cb5..3965b53cde9a4368efc714635de480bce527e957 100644
--- a/core/modules/help/tests/src/Functional/HelpTest.php
+++ b/core/modules/help/tests/src/Functional/HelpTest.php
@@ -18,7 +18,7 @@ class HelpTest extends BrowserTestBase {
    * overview page. The help_page_test module has a page section plugin that
    * returns no links.
    *
-   * @var array.
+   * @var array
    */
   public static $modules = ['help_test', 'help_page_test'];
 
diff --git a/core/modules/help/tests/src/Functional/NoHelpTest.php b/core/modules/help/tests/src/Functional/NoHelpTest.php
index acb2563aee1ae722c85a3f1bac08c05e617882e6..5df945e35cd059c284119b05f1df189fad29b906 100644
--- a/core/modules/help/tests/src/Functional/NoHelpTest.php
+++ b/core/modules/help/tests/src/Functional/NoHelpTest.php
@@ -16,7 +16,7 @@ class NoHelpTest extends BrowserTestBase {
    *
    * Use one of the test modules that do not implement hook_help().
    *
-   * @var array.
+   * @var array
    */
   public static $modules = ['help', 'menu_test'];
 
diff --git a/core/modules/history/tests/src/Functional/HistoryTest.php b/core/modules/history/tests/src/Functional/HistoryTest.php
index 065b9af7aab93075849ac5d52ce37ac6e7b16c25..d12bbccaf53c978ea5215de28f4311377b5aa89f 100644
--- a/core/modules/history/tests/src/Functional/HistoryTest.php
+++ b/core/modules/history/tests/src/Functional/HistoryTest.php
@@ -41,14 +41,14 @@ class HistoryTest extends BrowserTestBase {
   /**
    * The cookie jar holding the testing session cookies for Guzzle requests.
    *
-   * @var \GuzzleHttp\Client;
+   * @var \GuzzleHttp\Client
    */
   protected $client;
 
   /**
    * The Guzzle HTTP client.
    *
-   * @var \GuzzleHttp\Cookie\CookieJar;
+   * @var \GuzzleHttp\Cookie\CookieJar
    */
   protected $cookies;
 
diff --git a/core/modules/language/src/EventSubscriber/LanguageRequestSubscriber.php b/core/modules/language/src/EventSubscriber/LanguageRequestSubscriber.php
index b1effda1db7fe1ae0e10f934baf3c1c0606564cc..271194f9c4c1f1fc291739f5f58cfc46b6df868b 100644
--- a/core/modules/language/src/EventSubscriber/LanguageRequestSubscriber.php
+++ b/core/modules/language/src/EventSubscriber/LanguageRequestSubscriber.php
@@ -34,7 +34,7 @@ class LanguageRequestSubscriber implements EventSubscriberInterface {
   /**
    * The translation service.
    *
-   * @var \Drupal\Core\StringTranslation\Translator\TranslatorInterface;
+   * @var \Drupal\Core\StringTranslation\Translator\TranslatorInterface
    */
   protected $translation;
 
diff --git a/core/modules/language/tests/src/Functional/LanguageSelectorTranslatableTest.php b/core/modules/language/tests/src/Functional/LanguageSelectorTranslatableTest.php
index 3d027c3fb5d882ec421d84fdd906c7082729a63a..9526d226fdd7803fd4f75fe618353dd47e729df7 100644
--- a/core/modules/language/tests/src/Functional/LanguageSelectorTranslatableTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageSelectorTranslatableTest.php
@@ -29,7 +29,7 @@ class LanguageSelectorTranslatableTest extends BrowserTestBase {
   /**
    * The user with administrator privileges.
    *
-   * @var \Drupal\user\Entity\User;
+   * @var \Drupal\user\Entity\User
    */
   public $administrator;
 
diff --git a/core/modules/locale/src/LocaleConfigManager.php b/core/modules/locale/src/LocaleConfigManager.php
index 18f335c10bc0d80dd5a7ae8a190398c4a5fda7dd..547a1b504fcba22984e7a4dc3d8336db5da37d49 100644
--- a/core/modules/locale/src/LocaleConfigManager.php
+++ b/core/modules/locale/src/LocaleConfigManager.php
@@ -43,7 +43,7 @@ class LocaleConfigManager {
   /**
    * The string storage for reading and writing translations.
    *
-   * @var \Drupal\locale\StringStorageInterface;
+   * @var \Drupal\locale\StringStorageInterface
    */
   protected $localeStorage;
 
diff --git a/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberTest.php b/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberTest.php
index 0368350f0adb24dd35b66f60ba977f19778ab219..128b7b1d30c23660c81510122d2af7db43472bf1 100644
--- a/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberTest.php
+++ b/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberTest.php
@@ -37,7 +37,7 @@ class LocaleConfigSubscriberTest extends KernelTestBase {
   /**
    * The string storage used in this test.
    *
-   * @var \Drupal\locale\StringStorageInterface;
+   * @var \Drupal\locale\StringStorageInterface
    */
   protected $stringStorage;
 
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php
index 708addf03a4c5e2ce7563291cb94a4f41e20a9eb..af9f35c37fe287b9156261d732c23c1b4d197bf6 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php
@@ -72,7 +72,7 @@ class EntityConfigBase extends Entity {
   /**
    * The configuration factory.
    *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface;
+   * @var \Drupal\Core\Config\ConfigFactoryInterface
    */
   protected $configFactory;
 
diff --git a/core/modules/migrate/tests/src/Unit/MigrateSqlSourceTestCase.php b/core/modules/migrate/tests/src/Unit/MigrateSqlSourceTestCase.php
index 5f0d550cf7f5c0cf260dafc9380d5cec353d950b..9fe27ba9111d742980381b39617636767a7fed1e 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateSqlSourceTestCase.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateSqlSourceTestCase.php
@@ -19,7 +19,7 @@ abstract class MigrateSqlSourceTestCase extends MigrateTestCase {
   /**
    * The tested source plugin.
    *
-   * @var \Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase.
+   * @var \Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase
    */
   protected $source;
 
diff --git a/core/modules/migrate/tests/src/Unit/MigrateTestCase.php b/core/modules/migrate/tests/src/Unit/MigrateTestCase.php
index 558cecb94af0bbbed26d3f820cb3677614987e3b..5c1dd118ed92853e3625084f2ccfd77bb9137399 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateTestCase.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateTestCase.php
@@ -29,7 +29,7 @@ abstract class MigrateTestCase extends UnitTestCase {
   /**
    * Local store for mocking setStatus()/getStatus().
    *
-   * @var \Drupal\migrate\Plugin\MigrationInterface::STATUS_*
+   * @var int
    */
   protected $migrationStatus = MigrationInterface::STATUS_IDLE;
 
diff --git a/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php b/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php
index a00f1582bb7e83b17d7769fbb4c46ca9033f6372..0543bb70320632c02fda1cf9964f8242ae3857a8 100644
--- a/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php
+++ b/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php
@@ -60,7 +60,7 @@ class MigrateUpgradeImportBatch {
   /**
    * The follow-up migrations.
    *
-   * @var \Drupal\migrate\Plugin\MigrationInterface[];
+   * @var \Drupal\migrate\Plugin\MigrationInterface[]
    */
   protected static $followUpMigrations;
 
diff --git a/core/modules/node/tests/src/Functional/NodeAccessLanguageAwareCombinationTest.php b/core/modules/node/tests/src/Functional/NodeAccessLanguageAwareCombinationTest.php
index e388afcbcb4be4b4ec31d00e23466db3f11b8ae4..bc78291e3f40453859902a4a59bb1a73474db567 100644
--- a/core/modules/node/tests/src/Functional/NodeAccessLanguageAwareCombinationTest.php
+++ b/core/modules/node/tests/src/Functional/NodeAccessLanguageAwareCombinationTest.php
@@ -34,14 +34,14 @@ class NodeAccessLanguageAwareCombinationTest extends NodeTestBase {
   /**
    * A normal authenticated user.
    *
-   * @var \Drupal\user\UserInterface.
+   * @var \Drupal\user\UserInterface
    */
   protected $webUser;
 
   /**
    * User 1.
    *
-   * @var \Drupal\user\UserInterface.
+   * @var \Drupal\user\UserInterface
    */
   protected $adminUser;
 
diff --git a/core/modules/node/tests/src/Functional/NodeHelpTest.php b/core/modules/node/tests/src/Functional/NodeHelpTest.php
index c4b7139214813d9baa192ef4086db94e03d5ce56..4dad41618536db37b89c91e7a1842ee05d25dd73 100644
--- a/core/modules/node/tests/src/Functional/NodeHelpTest.php
+++ b/core/modules/node/tests/src/Functional/NodeHelpTest.php
@@ -14,7 +14,7 @@ class NodeHelpTest extends BrowserTestBase {
   /**
    * Modules to enable.
    *
-   * @var array.
+   * @var array
    */
   public static $modules = ['block', 'node', 'help'];
 
diff --git a/core/modules/page_cache/src/StackMiddleware/PageCache.php b/core/modules/page_cache/src/StackMiddleware/PageCache.php
index 82456b13dddaf6cae1f8f073e1beb8eae351b728..ca9a73371ab900fd6032b21d4e72470b3849c852 100644
--- a/core/modules/page_cache/src/StackMiddleware/PageCache.php
+++ b/core/modules/page_cache/src/StackMiddleware/PageCache.php
@@ -29,7 +29,7 @@ class PageCache implements HttpKernelInterface {
   /**
    * The cache bin.
    *
-   * @var \Drupal\Core\Cache\CacheBackendInterface.
+   * @var \Drupal\Core\Cache\CacheBackendInterface
    */
   protected $cache;
 
diff --git a/core/modules/quickedit/src/EditorSelector.php b/core/modules/quickedit/src/EditorSelector.php
index 9149786f04e7d80838f8fa80e0cfc4b72658ef20..7eb73068c1fb65b84d4c996923d3e2a35be98e75 100644
--- a/core/modules/quickedit/src/EditorSelector.php
+++ b/core/modules/quickedit/src/EditorSelector.php
@@ -22,7 +22,7 @@ class EditorSelector implements EditorSelectorInterface {
   /**
    * The manager for formatter plugins.
    *
-   * @var \Drupal\Core\Field\FormatterPluginManager.
+   * @var \Drupal\Core\Field\FormatterPluginManager
    */
   protected $formatterManager;
 
diff --git a/core/modules/quickedit/tests/src/Kernel/MetadataGeneratorTest.php b/core/modules/quickedit/tests/src/Kernel/MetadataGeneratorTest.php
index e0079e402fae317dde8bf26723576fe743fe6bd4..75f303049476421e1bd4283d00ec4733191c72f1 100644
--- a/core/modules/quickedit/tests/src/Kernel/MetadataGeneratorTest.php
+++ b/core/modules/quickedit/tests/src/Kernel/MetadataGeneratorTest.php
@@ -30,7 +30,7 @@ class MetadataGeneratorTest extends QuickEditTestBase {
   /**
    * The metadata generator object to be tested.
    *
-   * @var \Drupal\quickedit\MetadataGeneratorInterface.php
+   * @var \Drupal\quickedit\MetadataGeneratorInterface
    */
   protected $metadataGenerator;
 
diff --git a/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php b/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php
index 62b33e6f20e3c38b62053d948036327487bf2d79..ef5362a0edd80473ec2fb06775314dd727035375 100644
--- a/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php
+++ b/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php
@@ -48,7 +48,7 @@ class EntitySerializationTest extends NormalizerTestBase {
   /**
    * The serializer service.
    *
-   * @var \Symfony\Component\Serializer\Serializer.
+   * @var \Symfony\Component\Serializer\Serializer
    */
   protected $serializer;
 
diff --git a/core/modules/serialization/tests/src/Kernel/FieldItemSerializationTest.php b/core/modules/serialization/tests/src/Kernel/FieldItemSerializationTest.php
index 3e41d63037409bd9087f92b275a6319d3db5659a..403f41ab2bc49ad766410d313f8cc43fe90ab59f 100644
--- a/core/modules/serialization/tests/src/Kernel/FieldItemSerializationTest.php
+++ b/core/modules/serialization/tests/src/Kernel/FieldItemSerializationTest.php
@@ -43,7 +43,7 @@ class FieldItemSerializationTest extends NormalizerTestBase {
   /**
    * The serializer service.
    *
-   * @var \Symfony\Component\Serializer\Serializer.
+   * @var \Symfony\Component\Serializer\Serializer
    */
   protected $serializer;
 
diff --git a/core/modules/simpletest/src/KernelTestBase.php b/core/modules/simpletest/src/KernelTestBase.php
index c8b8669d542b627a030f54c05b3012b4ab4e3d9d..acf6b3e899884c6bccbf7282828b2ae9be92a491 100644
--- a/core/modules/simpletest/src/KernelTestBase.php
+++ b/core/modules/simpletest/src/KernelTestBase.php
@@ -102,7 +102,7 @@ abstract class KernelTestBase extends TestBase {
   /**
    * A KeyValueMemoryFactory instance to use when building the container.
    *
-   * @var \Drupal\Core\KeyValueStore\KeyValueMemoryFactory.
+   * @var \Drupal\Core\KeyValueStore\KeyValueMemoryFactory
    */
   protected $keyValueFactory;
 
diff --git a/core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php b/core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php
index f4c22bd8a77c10a9b5861041e12ec9a4bc735bda..1c714dc689ac7747636caa4762d2567194b87bae 100644
--- a/core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php
+++ b/core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php
@@ -38,7 +38,7 @@ class StatisticsAdminTest extends BrowserTestBase {
   /**
    * The Guzzle HTTP client.
    *
-   * @var \GuzzleHttp\Client;
+   * @var \GuzzleHttp\Client
    */
   protected $client;
 
diff --git a/core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php b/core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php
index 09565aefae7351c87ac1fc1b8016339a497e741a..ec2d2a5bb92b3b37d2af2358b23e773ec7eeac4e 100644
--- a/core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php
+++ b/core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php
@@ -39,7 +39,7 @@ class StatisticsLoggingTest extends BrowserTestBase {
   /**
    * The Guzzle HTTP client.
    *
-   * @var \GuzzleHttp\Client;
+   * @var \GuzzleHttp\Client
    */
   protected $client;
 
diff --git a/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php b/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php
index 6cf9079d5a3f981320440dab144e1191d0d2cc0b..0abbfd3f19bd7b765573c6c722314aeb1b5d16b6 100644
--- a/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php
+++ b/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php
@@ -22,7 +22,7 @@ abstract class SystemConfigFormTestBase extends WebTestBase {
   /**
    * Form ID to use for testing.
    *
-   * @var \Drupal\Core\Form\FormInterface.
+   * @var \Drupal\Core\Form\FormInterface
    */
   protected $form;
 
diff --git a/core/modules/system/tests/modules/error_test/src/Controller/ErrorTestController.php b/core/modules/system/tests/modules/error_test/src/Controller/ErrorTestController.php
index 2ba4869d8ad6a4bfd8241b2176092030e5b900f9..c64da6dc23f18663f06142808c710cb4e13cdb71 100644
--- a/core/modules/system/tests/modules/error_test/src/Controller/ErrorTestController.php
+++ b/core/modules/system/tests/modules/error_test/src/Controller/ErrorTestController.php
@@ -14,7 +14,7 @@ class ErrorTestController extends ControllerBase {
   /**
    * The database connection.
    *
-   * @var \Drupal\Core\Database\Connection;
+   * @var \Drupal\Core\Database\Connection
    */
   protected $database;
 
diff --git a/core/modules/system/tests/src/Kernel/Entity/EntityReferenceSelectionReferenceableTest.php b/core/modules/system/tests/src/Kernel/Entity/EntityReferenceSelectionReferenceableTest.php
index 8ccca7e44f423fca033129a9ce7b08087f272cd4..058f83bb933fe2c03724849d80b7da72b9c181c2 100644
--- a/core/modules/system/tests/src/Kernel/Entity/EntityReferenceSelectionReferenceableTest.php
+++ b/core/modules/system/tests/src/Kernel/Entity/EntityReferenceSelectionReferenceableTest.php
@@ -34,7 +34,7 @@ class EntityReferenceSelectionReferenceableTest extends KernelTestBase {
   /**
    * The selection handler.
    *
-   * @var \Drupal\Core\Entity\EntityReferenceSelection\SelectionInterface.
+   * @var \Drupal\Core\Entity\EntityReferenceSelection\SelectionInterface
    */
   protected $selectionHandler;
 
diff --git a/core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php b/core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php
index ee5a2602d8da3620199eec976e70945fe2642b46..6d8545b0ee553bc4fd81bb2daa0325d77921f377 100644
--- a/core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php
+++ b/core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php
@@ -34,7 +34,7 @@ class Tid extends ArgumentDefaultPluginBase implements CacheableDependencyInterf
   /**
    * The vocabulary storage.
    *
-   * @var \Drupal\taxonomy\VocabularyStorageInterface.
+   * @var \Drupal\taxonomy\VocabularyStorageInterface
    */
   protected $vocabularyStorage;
 
diff --git a/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php b/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php
index 367565c38757ff4cc8b2525f09aa0224cd92ef66..45f0095dbe169eb9500bbe3ceeab92efe4d57085 100644
--- a/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php
+++ b/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php
@@ -21,7 +21,7 @@ class TaxonomyIndexTid extends PrerenderList {
   /**
    * The vocabulary storage.
    *
-   * @var \Drupal\taxonomy\VocabularyStorageInterface.
+   * @var \Drupal\taxonomy\VocabularyStorageInterface
    */
   protected $vocabularyStorage;
 
diff --git a/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php b/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php
index 9b952ebbe3707577e27d555ca4015a410015ef68..6f2f1198733f0293386eb5f31522a1e2bbb1c717 100644
--- a/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php
+++ b/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php
@@ -22,7 +22,7 @@ trait TaxonomyTranslationTestTrait {
   /**
    * The vocabulary.
    *
-   * @var \Drupal\taxonomy\Entity\Vocabulary;
+   * @var \Drupal\taxonomy\Entity\Vocabulary
    */
   protected $vocabulary;
 
diff --git a/core/modules/taxonomy/src/VocabularyForm.php b/core/modules/taxonomy/src/VocabularyForm.php
index 83603e37022224784fe562e9f885066247638b3d..61b3638ec24e348c126ed3d4c34e028e988a7f2a 100644
--- a/core/modules/taxonomy/src/VocabularyForm.php
+++ b/core/modules/taxonomy/src/VocabularyForm.php
@@ -19,7 +19,7 @@ class VocabularyForm extends BundleEntityFormBase {
   /**
    * The vocabulary storage.
    *
-   * @var \Drupal\taxonomy\VocabularyStorageInterface.
+   * @var \Drupal\taxonomy\VocabularyStorageInterface
    */
   protected $vocabularyStorage;
 
diff --git a/core/modules/taxonomy/tests/src/Functional/TaxonomyTranslationTestTrait.php b/core/modules/taxonomy/tests/src/Functional/TaxonomyTranslationTestTrait.php
index a7fd54b020c26cec821eeb041c2637ba3d10cdcc..a817e12354a82339493ef9fb0d0ee4c3e1311c7e 100644
--- a/core/modules/taxonomy/tests/src/Functional/TaxonomyTranslationTestTrait.php
+++ b/core/modules/taxonomy/tests/src/Functional/TaxonomyTranslationTestTrait.php
@@ -17,7 +17,7 @@ trait TaxonomyTranslationTestTrait {
   /**
    * The vocabulary.
    *
-   * @var \Drupal\taxonomy\Entity\Vocabulary;
+   * @var \Drupal\taxonomy\Entity\Vocabulary
    */
   protected $vocabulary;
 
diff --git a/core/modules/text/tests/src/Kernel/TextWithSummaryItemTest.php b/core/modules/text/tests/src/Kernel/TextWithSummaryItemTest.php
index c110ba104981425b1d6e0ef4bee1d724839b92a2..195250abb9063aaa190a9e335fc5d2e960ba6a85 100644
--- a/core/modules/text/tests/src/Kernel/TextWithSummaryItemTest.php
+++ b/core/modules/text/tests/src/Kernel/TextWithSummaryItemTest.php
@@ -26,7 +26,7 @@ class TextWithSummaryItemTest extends FieldKernelTestBase {
   /**
    * Field storage entity.
    *
-   * @var \Drupal\field\Entity\FieldStorageConfig.
+   * @var \Drupal\field\Entity\FieldStorageConfig
    */
   protected $fieldStorage;
 
diff --git a/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php b/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php
index c6d9137888d19a08f66e72cf45ae9f23f28d5138..aa791651fc823a024922b7a92770524874e64049 100644
--- a/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php
+++ b/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php
@@ -26,7 +26,7 @@ class ViewsSelection extends SelectionPluginBase implements ContainerFactoryPlug
   /**
    * The loaded View object.
    *
-   * @var \Drupal\views\ViewExecutable;
+   * @var \Drupal\views\ViewExecutable
    */
   protected $view;
 
diff --git a/core/modules/views/src/Plugin/views/field/MachineName.php b/core/modules/views/src/Plugin/views/field/MachineName.php
index ea6a0c4be1fdf223d07c7325e31ba6b866375d21..b8ba62a4b6222265177357a647b5512ecafb5f9e 100644
--- a/core/modules/views/src/Plugin/views/field/MachineName.php
+++ b/core/modules/views/src/Plugin/views/field/MachineName.php
@@ -18,7 +18,9 @@
 class MachineName extends FieldPluginBase {
 
   /**
-   * @var array Stores the available options.
+   * Stores the available options.
+   *
+   * @var array
    */
   protected $valueOptions;
 
diff --git a/core/tests/Drupal/KernelTests/ConfigFormTestBase.php b/core/tests/Drupal/KernelTests/ConfigFormTestBase.php
index 9997dc54ba898b191415858bc62704faf48de13c..6436247357aa67772ccab61de6a3ad06a8997b1e 100644
--- a/core/tests/Drupal/KernelTests/ConfigFormTestBase.php
+++ b/core/tests/Drupal/KernelTests/ConfigFormTestBase.php
@@ -14,7 +14,7 @@ abstract class ConfigFormTestBase extends KernelTestBase {
   /**
    * Form ID to use for testing.
    *
-   * @var \Drupal\Core\Form\FormInterface.
+   * @var \Drupal\Core\Form\FormInterface
    */
   protected $form;
 
diff --git a/core/tests/Drupal/KernelTests/TestServiceProvider.php b/core/tests/Drupal/KernelTests/TestServiceProvider.php
index cc4944e224e2c5ac195bac6e2460db26acd3b4b9..4ae3ceb38dec207a91fe9c1b08fa88c2e9c63855 100644
--- a/core/tests/Drupal/KernelTests/TestServiceProvider.php
+++ b/core/tests/Drupal/KernelTests/TestServiceProvider.php
@@ -13,7 +13,7 @@
 class TestServiceProvider implements ServiceProviderInterface, ServiceModifierInterface {
 
   /**
-   * @var \Drupal\simpletest\TestBase;
+   * @var \Drupal\simpletest\TestBase
    */
   public static $currentTest;
 
diff --git a/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php
index 433ec38f411d9b000f8ab1a1e40931a60f790f14..75206c96e1846527e5d6721a61d3488ab5fa72de 100644
--- a/core/tests/Drupal/Tests/BrowserTestBase.php
+++ b/core/tests/Drupal/Tests/BrowserTestBase.php
@@ -140,7 +140,7 @@ abstract class BrowserTestBase extends TestCase {
    *
    * Value can be overridden using the environment variable MINK_DRIVER_CLASS.
    *
-   * @var string.
+   * @var string
    */
   protected $minkDefaultDriverClass = GoutteDriver::class;
 
diff --git a/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php
index badb981393dd462177b7422d0ddf091e996877e6..3b56cbd5fcb4f5ec19da78bace307a590e19e901 100644
--- a/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php
@@ -15,7 +15,7 @@ class CssCollectionGrouperUnitTest extends UnitTestCase {
   /**
    * A CSS asset grouper.
    *
-   * @var \Drupal\Core\Asset\CssCollectionGrouper object.
+   * @var \Drupal\Core\Asset\CssCollectionGrouper
    */
   protected $grouper;
 
diff --git a/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
index 18c7b0080eb6509d425fe4d6bddc5b5ba2eaa249..4c238cebd7395986ea36db76c0d6b43f00ae8888 100644
--- a/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
@@ -15,7 +15,7 @@ class CssCollectionRendererUnitTest extends UnitTestCase {
   /**
    * A CSS asset renderer.
    *
-   * @var \Drupal\Core\Asset\CssRenderer object.
+   * @var \Drupal\Core\Asset\CssCollectionRenderer
    */
   protected $renderer;
 
diff --git a/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
index f2e70b9fd5956f73d0111ddf060d5504213b26b5..5b71a1ca5f64e19869e64bcd83b03303e7b33947 100644
--- a/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
@@ -20,7 +20,7 @@ class CssOptimizerUnitTest extends UnitTestCase {
   /**
    * A CSS asset optimizer.
    *
-   * @var \Drupal\Core\Asset\CssOptimizer object.
+   * @var \Drupal\Core\Asset\CssOptimizer
    */
   protected $optimizer;
 
diff --git a/core/tests/Drupal/Tests/Core/Asset/JsOptimizerUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/JsOptimizerUnitTest.php
index 39a4d00f6181e5b0ae6fa07d1deb917f9005ba0f..204c0bd4ccd3cee4d0a45895a8603d39f0ba7243 100644
--- a/core/tests/Drupal/Tests/Core/Asset/JsOptimizerUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/JsOptimizerUnitTest.php
@@ -15,7 +15,7 @@ class JsOptimizerUnitTest extends UnitTestCase {
   /**
    * A JS asset optimizer.
    *
-   * @var \Drupal\Core\Asset\JsOptimizer object.
+   * @var \Drupal\Core\Asset\JsOptimizer
    */
   protected $optimizer;
 
diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
index a18e41076d10fbea3855cd926456c46a8232e212..bf7c8f7f6a79e7a288e33a857df856b491ad1cca 100644
--- a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
@@ -51,7 +51,7 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
   /**
    * The storage schema handler used in this test.
    *
-   * @var \Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema|\PHPUnit_Framework_MockObject_MockObject.
+   * @var \Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema|\PHPUnit_Framework_MockObject_MockObject
    */
   protected $storageSchema;
 
diff --git a/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php b/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php
index c7639388fd1005ca741b6eebf2623dc42abf6a60..2cc6edb884e2b50367446af350ad890fe1f2fa5c 100644
--- a/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php
+++ b/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php
@@ -38,7 +38,7 @@ class MenuActiveTrailTest extends UnitTestCase {
   /**
    * The current route match service.
    *
-   * @var \Drupal\Core\Routing\CurrentRouteMatch;
+   * @var \Drupal\Core\Routing\CurrentRouteMatch
    */
   protected $currentRouteMatch;