diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 4b42c73f487371a0792f5d0b4f97f648e941d360..6825b266d6615982c4bf63fa8809d84a2b7e7bb4 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -106,6 +106,7 @@
   <rule ref="Drupal.Commenting.VariableComment.MissingVar">
     <include-pattern>core/modules/*/tests/*</include-pattern>
     <include-pattern>core/profiles/*/tests/*</include-pattern>
+    <include-pattern>core/tests/*</include-pattern>
   </rule>
   <rule ref="Drupal.ControlStructures.ControlSignature"/>
   <rule ref="Drupal.ControlStructures.ElseIf"/>
diff --git a/core/tests/Drupal/FunctionalTests/Asset/AssetOptimizationTest.php b/core/tests/Drupal/FunctionalTests/Asset/AssetOptimizationTest.php
index 0b298f2175ec13feda80c3d12dec713c472c4bd4..96980a2c6059b14a4ef03b28e47d96c313bd5244 100644
--- a/core/tests/Drupal/FunctionalTests/Asset/AssetOptimizationTest.php
+++ b/core/tests/Drupal/FunctionalTests/Asset/AssetOptimizationTest.php
@@ -23,6 +23,8 @@ class AssetOptimizationTest extends BrowserTestBase {
 
   /**
    * The file assets path settings value.
+   *
+   * @var string
    */
   protected $fileAssetsPath;
 
diff --git a/core/tests/Drupal/FunctionalTests/Asset/UnversionedAssetTest.php b/core/tests/Drupal/FunctionalTests/Asset/UnversionedAssetTest.php
index 558803657a293d24c362d9329aa9c1d22c5ddfde..a2f84544ff59004d659ba1570b83e52e9bde24ba 100644
--- a/core/tests/Drupal/FunctionalTests/Asset/UnversionedAssetTest.php
+++ b/core/tests/Drupal/FunctionalTests/Asset/UnversionedAssetTest.php
@@ -20,6 +20,8 @@ class UnversionedAssetTest extends BrowserTestBase {
 
   /**
    * The file assets path settings value.
+   *
+   * @var string
    */
   protected $fileAssetsPath;
 
diff --git a/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigNoProfileTest.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigNoProfileTest.php
index e10cb2910fec16755f076dba0d95ac9262a9c4c7..ea4f70e3a6c60ae1c1ab19e64dffde169833b0ca 100644
--- a/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigNoProfileTest.php
+++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigNoProfileTest.php
@@ -12,7 +12,7 @@
 class InstallerExistingConfigNoProfileTest extends InstallerExistingConfigTest {
 
   /**
-   * Tests the install from config without a profile.
+   * {@inheritdoc}
    */
   protected $profile = FALSE;
 
diff --git a/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigTestBase.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigTestBase.php
index ec98efd802f35059796772276f954c450d850b35..fc820e53ab30184a0ed857783b8c583fc7bd421b 100644
--- a/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigTestBase.php
+++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigTestBase.php
@@ -21,14 +21,12 @@
 abstract class InstallerExistingConfigTestBase extends InstallerTestBase {
 
   /**
-   * This is set by the profile in the core.extension extracted.
-   *
-   * If set to FALSE, then the install will proceed without an install profile.
+   * {@inheritdoc}
    */
   protected $profile = NULL;
 
   /**
-   * @todo Fill out docblock.
+   * @var bool
    */
   protected $existingSyncDirectory = FALSE;
 
diff --git a/core/tests/Drupal/KernelTests/Core/Action/DeleteActionTest.php b/core/tests/Drupal/KernelTests/Core/Action/DeleteActionTest.php
index 35cda2bb5c045dcf7bf54079bf8e9d3993b7abe0..0302ec72da3643c42444262d97e4d2879abbcc37 100644
--- a/core/tests/Drupal/KernelTests/Core/Action/DeleteActionTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Action/DeleteActionTest.php
@@ -17,6 +17,8 @@ class DeleteActionTest extends KernelTestBase {
 
   /**
    * The test user.
+   *
+   * @var \Drupal\Core\Session\AccountInterface
    */
   protected $testUser;
 
diff --git a/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php b/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php
index a6f8dda1ca0dcc18743fb8d30e5e027ae8a6af34..fcac2ff73aef67345537edaad7b5e09397d23ec4 100644
--- a/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php
+++ b/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php
@@ -24,31 +24,43 @@ abstract class PluginTestBase extends KernelTestBase {
 
   /**
    * The test plugin manager used by Plugin API unit tests.
+   *
+   * @var \Drupal\plugin_test\Plugin\TestPluginManager
    */
   protected $testPluginManager;
 
   /**
    * The expected plugin definitions for the test plugin.
+   *
+   * @var array
    */
   protected $testPluginExpectedDefinitions;
 
   /**
    * The mock plugin manager used by Plugin API derivative unit tests.
+   *
+   * @var \Drupal\plugin_test\Plugin\MockBlockManager
    */
   protected $mockBlockManager;
 
   /**
    * The expected plugin definitions for the mock block plugin.
+   *
+   * @var array
    */
   protected $mockBlockExpectedDefinitions;
 
   /**
    * The default plugin manager used by Plugin API unit tests.
+   *
+   * @var \Drupal\plugin_test\Plugin\DefaultsTestPluginManager
    */
   protected $defaultsTestPluginManager;
 
   /**
    * The expected plugin definitions for the defaults plugin.
+   *
+   * @var array
    */
   protected $defaultsTestPluginExpectedDefinitions;
 
diff --git a/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php b/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php
index 687925101a06332bda4e2ce3dc8a2a0077f80a6a..e3896c733b5a7c2b3d2e4c5218ec348032f18f15 100644
--- a/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php
@@ -26,6 +26,8 @@ class RegistryTest extends KernelTestBase {
 
   /**
    * The profile to use for this test.
+   *
+   * @var string
    */
   protected $profile = 'testing';
 
diff --git a/core/tests/Drupal/Tests/Component/Annotation/PluginTest.php b/core/tests/Drupal/Tests/Component/Annotation/PluginTest.php
index dd2db0b7253cf4e6c332c50510e59d07a85a25e4..ad02c2ddba47fb3dc5ab0e572fb6caae1debbefc 100644
--- a/core/tests/Drupal/Tests/Component/Annotation/PluginTest.php
+++ b/core/tests/Drupal/Tests/Component/Annotation/PluginTest.php
@@ -100,6 +100,8 @@ class PluginStub extends Plugin {
 
   /**
    * A default property for testing.
+   *
+   * @var string
    */
   protected $defaultProperty = 'test_value';
 
diff --git a/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFastFileStorageTest.php b/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFastFileStorageTest.php
index 222ca9031bf009c33182722030ba6fbbbcf59c91..6e65e0ca8ddecd1100ec7eaf9c1cc4b3595c66c7 100644
--- a/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFastFileStorageTest.php
+++ b/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFastFileStorageTest.php
@@ -20,11 +20,15 @@ class MTimeProtectedFastFileStorageTest extends MTimeProtectedFileStorageBase {
    * The first iteration does not change the directory mtime so this class will
    * include the hacked file on the first try but the second test will change
    * the directory mtime and so on the second try the file will not be included.
+   *
+   * @var bool[]
    */
   protected array $expected = [TRUE, FALSE];
 
   /**
    * The PHP storage class to test.
+   *
+   * @var class-string
    */
   protected $storageClass = 'Drupal\Component\PhpStorage\MTimeProtectedFastFileStorage';
 
diff --git a/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageTest.php b/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageTest.php
index ef3b0ac478adb8cad86a275083e4f7a185ec6da1..0abed0e1233d08a04990751f36c41e655388cd13 100644
--- a/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageTest.php
+++ b/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageTest.php
@@ -19,11 +19,15 @@ class MTimeProtectedFileStorageTest extends MTimeProtectedFileStorageBase {
    *
    * The default implementation protects against even the filemtime change so
    * both iterations will return FALSE.
+   *
+   * @var bool[]
    */
   protected array $expected = [FALSE, FALSE];
 
   /**
    * The PHP storage class to test.
+   *
+   * @var class-string
    */
   protected $storageClass = 'Drupal\Component\PhpStorage\MTimeProtectedFileStorage';
 
diff --git a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/ScaffoldTestResult.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/ScaffoldTestResult.php
index f44c12ce1d942105467234f0728f482b47c8f922..f474e95074c2bcc224261abcfc7b76e65566f482 100644
--- a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/ScaffoldTestResult.php
+++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/ScaffoldTestResult.php
@@ -11,11 +11,15 @@ class ScaffoldTestResult {
 
   /**
    * The location of the scaffold fixture.
+   *
+   * @var string
    */
   protected $docroot;
 
   /**
    * The stdout from the test.
+   *
+   * @var string
    */
   protected $scaffoldOutput;
 
diff --git a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php
index 7d1566d9ff92bd11c848a12f561d8779edfba817..8e15bd49741c7687bf65bab794ad116c1b7af78b 100644
--- a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php
@@ -85,6 +85,8 @@ class LibraryDiscoveryCollectorTest extends UnitTestCase {
 
   /**
    * The active theme.
+   *
+   * @var \Drupal\Core\Theme\ActiveTheme|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $activeTheme;
 
diff --git a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php
index 991f7d389daf8c6eae56b77281a9a774bac7da84..96a114e5bf1ca3ed397c199f07422546ffa21177 100644
--- a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php
@@ -871,6 +871,8 @@ class TestLibraryDiscoveryParser extends LibraryDiscoveryParser {
 
   /**
    * The valid URIs.
+   *
+   * @var array
    */
   protected $validUris;
 
diff --git a/core/tests/Drupal/Tests/Core/Common/TagsTest.php b/core/tests/Drupal/Tests/Core/Common/TagsTest.php
index 11f1dc17616e60b99cf44900e863143c022a1d7e..cb8084365bb8f70ae46950e862e8bc8946f3779b 100644
--- a/core/tests/Drupal/Tests/Core/Common/TagsTest.php
+++ b/core/tests/Drupal/Tests/Core/Common/TagsTest.php
@@ -18,6 +18,8 @@ class TagsTest extends UnitTestCase {
 
   /**
    * A list of valid tags.
+   *
+   * @var string[][]
    */
   protected $validTags = [
     'Drupal' => 'Drupal',
diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php
index f876e75ad33f335533b86c48386c70674c7ab3c9..03f1059d18260a3f66e510dcf4f20fe0f3a4cb7c 100644
--- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php
@@ -724,11 +724,15 @@ class TestConfigEntityWithPluginCollections extends ConfigEntityBaseWithPluginCo
 
   /**
    * The plugin collection.
+   *
+   * @var \Drupal\Core\Plugin\DefaultLazyPluginCollection
    */
   protected $pluginCollection;
 
   /**
    * The plugin manager.
+   *
+   * @var \Drupal\Component\Plugin\PluginManagerInterface|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $pluginManager;
 
diff --git a/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php b/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php
index a89e2a6f73a51729a2e7ef458180d069023b3582..18934e5d49ff1eb5429462be7ab8c093672902ad 100644
--- a/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php
+++ b/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php
@@ -208,6 +208,8 @@ class MockContainerInjection implements ContainerInjectionInterface {
 
   /**
    * The test value saved during construction.
+   *
+   * @var string
    */
   protected $result;
 
diff --git a/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
index ee289906b91e3a213802482ba0a485f54cd9d8ad..e82cd6885cbc2bef573cefa90ecafd75f0c7726a 100644
--- a/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
@@ -638,26 +638,36 @@ class EntityBaseTest extends EntityBase {
 
   /**
    * The entity ID.
+   *
+   * @var string
    */
   public $id;
 
   /**
    * The language code for the entity.
+   *
+   * @var string
    */
   public $langcode;
 
   /**
    * The entity UUID.
+   *
+   * @var string
    */
   public $uuid;
 
   /**
    * The entity label.
+   *
+   * @var string
    */
   public $label;
 
   /**
    * The original, or NULL if the entity cannot be loaded.
+   *
+   * @var string
    */
   public $original;
 
diff --git a/core/tests/Drupal/Tests/Core/Entity/StubEntityBase.php b/core/tests/Drupal/Tests/Core/Entity/StubEntityBase.php
index dce32a895865058da3fd72038c7210a530feca58..1fe7b543ba7fcedb2f3aef91b02e25432e61782a 100644
--- a/core/tests/Drupal/Tests/Core/Entity/StubEntityBase.php
+++ b/core/tests/Drupal/Tests/Core/Entity/StubEntityBase.php
@@ -13,22 +13,30 @@ class StubEntityBase extends EntityBase {
 
   /**
    * The ID for the stub entity.
+   *
+   * @var string
    */
   public $id;
 
   /**
    * The language code for the stub entity.
+   *
+   * @var string
    */
 
   public $langcode;
 
   /**
    * The UUID for the stub entity.
+   *
+   * @var string
    */
   public $uuid;
 
   /**
    * The label for the stub entity.
+   *
+   * @var string
    */
   public $label;
 
diff --git a/core/tests/Drupal/Tests/Core/Extension/GenericTestExistsTest.php b/core/tests/Drupal/Tests/Core/Extension/GenericTestExistsTest.php
index fb540f943375c7f509145027ac1bd0ee58be4d8f..488108a1aa8828a559b69f8ff01b409c5a157fce 100644
--- a/core/tests/Drupal/Tests/Core/Extension/GenericTestExistsTest.php
+++ b/core/tests/Drupal/Tests/Core/Extension/GenericTestExistsTest.php
@@ -18,6 +18,8 @@ class GenericTestExistsTest extends UnitTestCase {
 
   /**
    * Lists module that do not require a Generic test.
+   *
+   * @var string[]
    */
   protected $modulesNoTest = ['help_topics', 'sdc'];
 
diff --git a/core/tests/Drupal/Tests/Core/Form/ConfigFormBaseTraitTest.php b/core/tests/Drupal/Tests/Core/Form/ConfigFormBaseTraitTest.php
index 292d9ff7991cd14422709f707f9ca20e8334e76b..a1111cf5b456a11b04994683c401eb78b5d160b5 100644
--- a/core/tests/Drupal/Tests/Core/Form/ConfigFormBaseTraitTest.php
+++ b/core/tests/Drupal/Tests/Core/Form/ConfigFormBaseTraitTest.php
@@ -74,6 +74,8 @@ class ConfiguredTrait {
 
   /**
    * The configuration factory.
+   *
+   * @var null
    */
   public $configFactory;
 
diff --git a/core/tests/Drupal/Tests/Core/Logger/LoggerChannelTest.php b/core/tests/Drupal/Tests/Core/Logger/LoggerChannelTest.php
index 31f2f417cbf939314cc848292f876423246f6691..c8f8b2593aa3337c2a7fe9ed57a4ffe9da350de3 100644
--- a/core/tests/Drupal/Tests/Core/Logger/LoggerChannelTest.php
+++ b/core/tests/Drupal/Tests/Core/Logger/LoggerChannelTest.php
@@ -190,11 +190,15 @@ class NaughtyRecursiveLogger implements LoggerInterface {
 
   /**
    * The logger channel.
+   *
+   * @var \Drupal\Core\Logger\LoggerChannel
    */
   protected $channel;
 
   /**
    * The message to log.
+   *
+   * @var string|\Stringable
    */
   protected $message;
 
diff --git a/core/tests/Drupal/Tests/Core/Menu/MenuLinkMock.php b/core/tests/Drupal/Tests/Core/Menu/MenuLinkMock.php
index fa49a1f2001d0597507a4aa48e966e0b436e64fd..2275ef3ffe11df740abe508b09d29fde40936fc3 100644
--- a/core/tests/Drupal/Tests/Core/Menu/MenuLinkMock.php
+++ b/core/tests/Drupal/Tests/Core/Menu/MenuLinkMock.php
@@ -14,6 +14,8 @@ class MenuLinkMock extends MenuLinkBase {
 
   /**
    * The default configuration for the test menu link.
+   *
+   * @var array
    */
   protected static $defaults = [
     'menu_name' => 'mock',
diff --git a/core/tests/Drupal/Tests/Core/Plugin/FilteredPluginManagerTraitTest.php b/core/tests/Drupal/Tests/Core/Plugin/FilteredPluginManagerTraitTest.php
index df45f38aeed90665026695a3e37f465af001e093..28a8da4dce9c9a155271bb8c1893247115f5a2b4 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/FilteredPluginManagerTraitTest.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/FilteredPluginManagerTraitTest.php
@@ -87,21 +87,29 @@ class TestFilteredPluginManager extends PluginManagerBase implements FilteredPlu
 
   /**
    * An array of plugin definitions.
+   *
+   * @var array
    */
   protected $definitions = [];
 
   /**
    * The module handler.
+   *
+   * @var Drupal\Core\Extension\ModuleHandlerInterface
    */
   protected $moduleHandler;
 
   /**
    * The theme manager.
+   *
+   * @var Drupal\Core\Theme\ThemeManagerInterface
    */
   protected $themeManager;
 
   /**
    * The context handler.
+   *
+   * @var Drupal\Core\Plugin\Context\ContextHandlerInterface
    */
   protected $contextHandler;
 
diff --git a/core/tests/Drupal/Tests/Core/Plugin/PluginDependencyTraitTest.php b/core/tests/Drupal/Tests/Core/Plugin/PluginDependencyTraitTest.php
index c881b25fbd5379396398d8d51a529c321c372299..41976c89e00ce0d3d93bdf33af81b2b02275eed5 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/PluginDependencyTraitTest.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/PluginDependencyTraitTest.php
@@ -179,11 +179,15 @@ class TestPluginDependency {
 
   /**
    * The module handler.
+   *
+   * @var Drupal\Core\Extension\ModuleHandlerInterface
    */
   protected $moduleHandler;
 
   /**
    * The theme handler.
+   *
+   * @var Drupal\Core\Extension\ThemeHandlerInterface
    */
   protected $themeHandler;
 
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererTest.php b/core/tests/Drupal/Tests/Core/Render/RendererTest.php
index 751b80e735f6e21c4ea0d4476aefb89cdb70072d..b08e2910c09264e83a0520f17b3cc4f0245ff3ad 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererTest.php
@@ -26,6 +26,8 @@ class RendererTest extends RendererTestBase {
 
   /**
    * The expected theme variables.
+   *
+   * @var array
    */
   protected $defaultThemeVars = [
     '#cache' => [
diff --git a/core/tests/Drupal/Tests/Core/Render/TestCacheableDependency.php b/core/tests/Drupal/Tests/Core/Render/TestCacheableDependency.php
index 8465899488a1505f8506278b5b3f239dd4503ba0..d576ba8856e73974f217d43a8efa6a9adc8f14c2 100644
--- a/core/tests/Drupal/Tests/Core/Render/TestCacheableDependency.php
+++ b/core/tests/Drupal/Tests/Core/Render/TestCacheableDependency.php
@@ -24,7 +24,7 @@ class TestCacheableDependency implements CacheableDependencyInterface {
   /**
    * The cache maximum age.
    */
-  protected $maxAge;
+  protected int $maxAge;
 
   public function __construct(array $contexts, array $tags, $max_age) {
     $this->contexts = $contexts;
diff --git a/core/tests/Drupal/Tests/Core/Session/AccessPolicyProcessorTest.php b/core/tests/Drupal/Tests/Core/Session/AccessPolicyProcessorTest.php
index b42de0512345138f9668984c32314f220ce576f5..75e0e4f90bf92a10d1947a43b4a2a098b2e56b49 100644
--- a/core/tests/Drupal/Tests/Core/Session/AccessPolicyProcessorTest.php
+++ b/core/tests/Drupal/Tests/Core/Session/AccessPolicyProcessorTest.php
@@ -552,6 +552,8 @@ class CacheItem {
 
   /**
    * The cache data.
+   *
+   * @var \Drupal\Core\Session\CalculatedPermissions
    */
   public $data;
 
diff --git a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
index 4167fa4a30ee233d63f05f0ea68507c7fdca6e3e..158c8749239cc2371d1d4d8e40252f5178e4c5e9 100644
--- a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
+++ b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
@@ -679,6 +679,8 @@ class TwigExtensionTestString {
 
   /**
    * The test string.
+   *
+   * @var string
    */
   protected $string;
 
diff --git a/core/tests/Drupal/Tests/Core/Utility/CallableResolverTest.php b/core/tests/Drupal/Tests/Core/Utility/CallableResolverTest.php
index bb340b6099188d116fbb80f60954db08a14c4874..95f710a343ffc6ec9dbe54e8f8f94c61cf27f090 100644
--- a/core/tests/Drupal/Tests/Core/Utility/CallableResolverTest.php
+++ b/core/tests/Drupal/Tests/Core/Utility/CallableResolverTest.php
@@ -215,6 +215,8 @@ class MockContainerInjection implements ContainerInjectionInterface {
 
   /**
    * The value to be injected.
+   *
+   * @var string
    */
   protected $injected;
 
diff --git a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
index 67afbed60bfbde3fba5a8eeb697849cef369a37c..4a6c9e93470bdf6b0b5ad5ba9e6035c28b4f6252 100644
--- a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
@@ -60,6 +60,8 @@ class LinkGeneratorTest extends UnitTestCase {
 
   /**
    * Contains the LinkGenerator default options.
+   *
+   * @var array
    */
   protected $defaultOptions = [
     'query' => [],
diff --git a/core/tests/Drupal/Tests/PerformanceData.php b/core/tests/Drupal/Tests/PerformanceData.php
index e26c31b939cac04d5c174dfde70a31ad5ba90b2d..dad60e1be3529e3d9064ae5999e7bec5f3bc5051 100644
--- a/core/tests/Drupal/Tests/PerformanceData.php
+++ b/core/tests/Drupal/Tests/PerformanceData.php
@@ -87,6 +87,8 @@ class PerformanceData {
 
   /**
    * The original return value.
+   *
+   * @var mixed
    */
   protected $returnValue;
 
diff --git a/core/tests/Drupal/Tests/StreamCapturer.php b/core/tests/Drupal/Tests/StreamCapturer.php
index 86bfec396653d4db27b5d5db07496a03c2af07cb..3cf37572a1ecceb0ed366c5430d7bf695b803c48 100644
--- a/core/tests/Drupal/Tests/StreamCapturer.php
+++ b/core/tests/Drupal/Tests/StreamCapturer.php
@@ -13,6 +13,8 @@ class StreamCapturer extends \php_user_filter {
 
   /**
    * The cache data.
+   *
+   * @var string
    */
   public static $cache = '';