diff --git a/core/lib/Drupal/Component/Datetime/DateTimePlus.php b/core/lib/Drupal/Component/Datetime/DateTimePlus.php
index 5a8365c1fa..84c558f15a 100644
--- a/core/lib/Drupal/Component/Datetime/DateTimePlus.php
+++ b/core/lib/Drupal/Component/Datetime/DateTimePlus.php
@@ -54,6 +54,8 @@ class DateTimePlus {
 
   /**
    * An array of possible date parts.
+   *
+   * @var array
    */
   protected static $dateParts = [
     'year',
@@ -66,41 +68,57 @@ class DateTimePlus {
 
   /**
    * The value of the time value passed to the constructor.
+   *
+   * @var string
    */
   protected $inputTimeRaw = '';
 
   /**
    * The prepared time, without timezone, for this date.
+   *
+   * @var string
    */
   protected $inputTimeAdjusted = '';
 
   /**
    * The value of the timezone passed to the constructor.
+   *
+   * @var string
    */
   protected $inputTimeZoneRaw = '';
 
   /**
    * The prepared timezone object used to construct this date.
+   *
+   * @var string
    */
   protected $inputTimeZoneAdjusted = '';
 
   /**
    * The value of the format passed to the constructor.
+   *
+   * @var string
    */
   protected $inputFormatRaw = '';
 
   /**
    * The prepared format, if provided.
+   *
+   * @var string
    */
   protected $inputFormatAdjusted = '';
 
   /**
    * The value of the language code passed to the constructor.
+   *
+   * @var string|null
    */
   protected $langcode = NULL;
 
   /**
    * An array of errors encountered when creating this date.
+   *
+   * @var array
    */
   protected $errors = [];
 
diff --git a/core/lib/Drupal/Component/Gettext/PoItem.php b/core/lib/Drupal/Component/Gettext/PoItem.php
index c1c3877ed5..2c5c596447 100644
--- a/core/lib/Drupal/Component/Gettext/PoItem.php
+++ b/core/lib/Drupal/Component/Gettext/PoItem.php
@@ -13,7 +13,7 @@ class PoItem {
   /**
    * The language code this translation is in.
    *
-   * @car string
+   * @var string
    */
   private $_langcode;
 
diff --git a/core/lib/Drupal/Component/Graph/Graph.php b/core/lib/Drupal/Component/Graph/Graph.php
index b155faa662..1ef37d47d6 100644
--- a/core/lib/Drupal/Component/Graph/Graph.php
+++ b/core/lib/Drupal/Component/Graph/Graph.php
@@ -9,6 +9,8 @@ class Graph {
 
   /**
    * Holds the directed acyclic graph.
+   *
+   * @var array
    */
   protected $graph;
 
diff --git a/core/lib/Drupal/Core/Access/CheckProvider.php b/core/lib/Drupal/Core/Access/CheckProvider.php
index d6ba1cf6dd..61689b2b9d 100644
--- a/core/lib/Drupal/Core/Access/CheckProvider.php
+++ b/core/lib/Drupal/Core/Access/CheckProvider.php
@@ -38,6 +38,8 @@ class CheckProvider implements CheckProviderInterface, ContainerAwareInterface {
 
   /**
    * Array of access checks which only will be run on the incoming request.
+   *
+   * @var array
    */
   protected $checksNeedsRequest = [];
 
diff --git a/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php b/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php
index 952dc14adb..620787b6bb 100644
--- a/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php
@@ -13,7 +13,7 @@ class LanguagesCacheContext implements CalculatedCacheContextInterface {
   /**
    * The language manager.
    *
-   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
+   * @var \Drupal\Core\Language\LanguageManagerInterface
    */
   protected $languageManager;
 
diff --git a/core/lib/Drupal/Core/Cache/MemoryBackend.php b/core/lib/Drupal/Core/Cache/MemoryBackend.php
index edda4d37f9..bf09b8b96d 100644
--- a/core/lib/Drupal/Core/Cache/MemoryBackend.php
+++ b/core/lib/Drupal/Core/Cache/MemoryBackend.php
@@ -21,6 +21,8 @@ class MemoryBackend implements CacheBackendInterface, CacheTagsInvalidatorInterf
 
   /**
    * Array to store cache objects.
+   *
+   * @var array
    */
   protected $cache = [];
 
diff --git a/core/lib/Drupal/Core/Cache/PhpBackend.php b/core/lib/Drupal/Core/Cache/PhpBackend.php
index 2404493404..1860c93768 100644
--- a/core/lib/Drupal/Core/Cache/PhpBackend.php
+++ b/core/lib/Drupal/Core/Cache/PhpBackend.php
@@ -27,6 +27,8 @@ class PhpBackend implements CacheBackendInterface {
 
   /**
    * Array to store cache objects.
+   *
+   * @var array
    */
   protected $cache = [];
 
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php
index 11c9ff1bf0..5dc00437e2 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php
@@ -14,6 +14,8 @@ class ConfigEntityType extends EntityType implements ConfigEntityTypeInterface {
   /**
    * The config prefix set in the configuration entity type annotation.
    *
+   * @var string
+   *
    * @see \Drupal\Core\Config\Entity\ConfigEntityTypeInterface::getConfigPrefix()
    */
   protected $config_prefix;
diff --git a/core/lib/Drupal/Core/Config/Schema/ArrayElement.php b/core/lib/Drupal/Core/Config/Schema/ArrayElement.php
index b16cee0aea..559ac57841 100644
--- a/core/lib/Drupal/Core/Config/Schema/ArrayElement.php
+++ b/core/lib/Drupal/Core/Config/Schema/ArrayElement.php
@@ -11,6 +11,8 @@
 
   /**
    * Parsed elements.
+   *
+   * @var array
    */
   protected $elements;
 
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
index e696f242fd..97f13cb8b1 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
@@ -40,6 +40,8 @@ class Connection extends DatabaseConnection {
    *
    * In PostgreSQL, 'LIKE' is case-sensitive. ILKE should be used for
    * case-insensitive statements.
+   *
+   * @var array
    */
   protected static $postgresqlConditionOperatorMap = [
     'LIKE' => ['operator' => 'ILIKE'],
@@ -52,6 +54,8 @@ class Connection extends DatabaseConnection {
    * The list of PostgreSQL reserved key words.
    *
    * @see http://www.postgresql.org/docs/9.4/static/sql-keywords-appendix.html
+   *
+   * @var array
    */
   protected $postgresqlReservedKeyWords = ['all', 'analyse', 'analyze', 'and',
     'any', 'array', 'as', 'asc', 'asymmetric', 'authorization', 'binary', 'both',
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
index a7c1496c7a..5e9ab28aae 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
@@ -27,6 +27,8 @@ class Connection extends DatabaseConnection {
    * A map of condition operators to SQLite operators.
    *
    * We don't want to override any of the defaults.
+   *
+   * @var array
    */
   protected static $sqliteConditionOperatorMap = [
     'LIKE' => ['postfix' => " ESCAPE '\\'"],
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
index 27b6a58fbb..6e772cd2b2 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
@@ -19,6 +19,8 @@ class Schema extends DatabaseSchema {
 
   /**
    * Override DatabaseSchema::$defaultSchema
+   *
+   * @var string
    */
   protected $defaultSchema = 'main';
 
diff --git a/core/lib/Drupal/Core/Database/Query/Condition.php b/core/lib/Drupal/Core/Database/Query/Condition.php
index 51693576e8..ee2634c9ec 100644
--- a/core/lib/Drupal/Core/Database/Query/Condition.php
+++ b/core/lib/Drupal/Core/Database/Query/Condition.php
@@ -12,6 +12,8 @@ class Condition implements ConditionInterface, \Countable {
 
   /**
    * Provides a map of condition operators to condition operator options.
+   *
+   * @var array
    */
   protected static $conditionOperatorMap = [
     'BETWEEN' => ['delimiter' => ' AND '],
@@ -61,6 +63,8 @@ class Condition implements ConditionInterface, \Countable {
 
   /**
    * The identifier of the query placeholder this condition has been compiled against.
+   *
+   * @var string
    */
   protected $queryPlaceholderIdentifier;
 
diff --git a/core/lib/Drupal/Core/Database/Query/Merge.php b/core/lib/Drupal/Core/Database/Query/Merge.php
index 43188ec8ca..bf81d2a685 100644
--- a/core/lib/Drupal/Core/Database/Query/Merge.php
+++ b/core/lib/Drupal/Core/Database/Query/Merge.php
@@ -66,6 +66,8 @@ class Merge extends Query implements ConditionInterface {
 
   /**
    * The table or subquery to be used for the condition.
+   *
+   * @var string
    */
   protected $conditionTable;
 
diff --git a/core/lib/Drupal/Core/Database/Query/Query.php b/core/lib/Drupal/Core/Database/Query/Query.php
index 94f71a5a4e..3eb8207979 100644
--- a/core/lib/Drupal/Core/Database/Query/Query.php
+++ b/core/lib/Drupal/Core/Database/Query/Query.php
@@ -43,11 +43,15 @@
 
   /**
    * A unique identifier for this query object.
+   *
+   * @var string
    */
   protected $uniqueIdentifier;
 
   /**
    * The placeholder counter.
+   *
+   * @var int
    */
   protected $nextPlaceholder = 0;
 
diff --git a/core/lib/Drupal/Core/Database/Query/Select.php b/core/lib/Drupal/Core/Database/Query/Select.php
index ee4ed848ab..61cb39731b 100644
--- a/core/lib/Drupal/Core/Database/Query/Select.php
+++ b/core/lib/Drupal/Core/Database/Query/Select.php
@@ -113,6 +113,8 @@ class Select extends Query implements SelectInterface {
 
   /**
    * The FOR UPDATE status
+   *
+   * @var bool
    */
   protected $forUpdate = FALSE;
 
diff --git a/core/lib/Drupal/Core/Database/Query/SelectExtender.php b/core/lib/Drupal/Core/Database/Query/SelectExtender.php
index 9082ca8056..59f91bee11 100644
--- a/core/lib/Drupal/Core/Database/Query/SelectExtender.php
+++ b/core/lib/Drupal/Core/Database/Query/SelectExtender.php
@@ -25,11 +25,15 @@ class SelectExtender implements SelectInterface {
 
   /**
    * A unique identifier for this query object.
+   *
+   * @var string
    */
   protected $uniqueIdentifier;
 
   /**
    * The placeholder counter.
+   *
+   * @var int
    */
   protected $placeholder = 0;
 
diff --git a/core/lib/Drupal/Core/Database/Query/TableSortExtender.php b/core/lib/Drupal/Core/Database/Query/TableSortExtender.php
index 4f739ee304..1cf60eb0a9 100644
--- a/core/lib/Drupal/Core/Database/Query/TableSortExtender.php
+++ b/core/lib/Drupal/Core/Database/Query/TableSortExtender.php
@@ -11,6 +11,8 @@ class TableSortExtender extends SelectExtender {
 
   /**
    * The array of fields that can be sorted by.
+   *
+   * @var array
    */
   protected $header = [];
 
diff --git a/core/lib/Drupal/Core/Database/Schema.php b/core/lib/Drupal/Core/Database/Schema.php
index 80a68f6e5a..42daa62afd 100644
--- a/core/lib/Drupal/Core/Database/Schema.php
+++ b/core/lib/Drupal/Core/Database/Schema.php
@@ -19,6 +19,8 @@
 
   /**
    * The placeholder counter.
+   *
+   * @var int
    */
   protected $placeholder = 0;
 
@@ -30,11 +32,15 @@
    * method.
    *
    * @see DatabaseSchema::getPrefixInfo()
+   *
+   * @var string
    */
   protected $defaultSchema = 'public';
 
   /**
    * A unique identifier for this query object.
+   *
+   * @var string
    */
   protected $uniqueIdentifier;
 
diff --git a/core/lib/Drupal/Core/Database/Transaction.php b/core/lib/Drupal/Core/Database/Transaction.php
index 837afda6de..8aed8c8ae6 100644
--- a/core/lib/Drupal/Core/Database/Transaction.php
+++ b/core/lib/Drupal/Core/Database/Transaction.php
@@ -42,6 +42,8 @@ class Transaction {
    *
    * This is used to label the transaction savepoint. It will be overridden to
    * 'drupal_transaction' if there is no transaction depth.
+   *
+   * @var string
    */
   protected $name;
 
diff --git a/core/lib/Drupal/Core/Datetime/DrupalDateTime.php b/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
index bb7b821bc3..1e6ddfaff6 100644
--- a/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
+++ b/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
@@ -24,6 +24,8 @@ class DrupalDateTime extends DateTimePlus {
 
   /**
    * Format string translation cache.
+   *
+   * @var array
    */
   protected $formatTranslationCache;
 
diff --git a/core/lib/Drupal/Core/Entity/Annotation/EntityType.php b/core/lib/Drupal/Core/Entity/Annotation/EntityType.php
index 99335ae292..9d14bed06d 100644
--- a/core/lib/Drupal/Core/Entity/Annotation/EntityType.php
+++ b/core/lib/Drupal/Core/Entity/Annotation/EntityType.php
@@ -33,6 +33,8 @@ class EntityType extends Plugin {
 
   /**
    * The group machine name.
+   *
+   * @var string
    */
   public $group = 'default';
 
diff --git a/core/lib/Drupal/Core/Entity/EntityFieldManager.php b/core/lib/Drupal/Core/Entity/EntityFieldManager.php
index d6e70eef75..63c35e9743 100644
--- a/core/lib/Drupal/Core/Entity/EntityFieldManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityFieldManager.php
@@ -60,7 +60,7 @@ class EntityFieldManager implements EntityFieldManagerInterface {
    *   - type: The field type.
    *   - bundles: The bundles in which the field appears.
    *
-   * @return array
+   * @var array
    */
   protected $fieldMap = [];
 
diff --git a/core/lib/Drupal/Core/Entity/EntityType.php b/core/lib/Drupal/Core/Entity/EntityType.php
index 9584ed3e26..a4f322e2b4 100644
--- a/core/lib/Drupal/Core/Entity/EntityType.php
+++ b/core/lib/Drupal/Core/Entity/EntityType.php
@@ -224,11 +224,15 @@ class EntityType extends PluginDefinition implements EntityTypeInterface {
 
   /**
    * The machine name of the entity type group.
+   *
+   * @var string
    */
   protected $group;
 
   /**
    * The human-readable name of the entity type group.
+   *
+   * @var string
    */
   protected $group_label;
 
diff --git a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
index cd0e06a61b..96a75da78a 100644
--- a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
+++ b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
@@ -52,7 +52,7 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
   /**
    * The language manager.
    *
-   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
+   * @var \Drupal\Core\Language\LanguageManagerInterface
    */
   protected $languageManager;
 
@@ -66,9 +66,9 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
   /**
    * The EntityViewDisplay objects created for individual field rendering.
    *
-   * @see \Drupal\Core\Entity\EntityViewBuilder::getSingleFieldDisplay()
+   * @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface[]
    *
-   * @param \Drupal\Core\Entity\Display\EntityViewDisplayInterface[]
+   * @see \Drupal\Core\Entity\EntityViewBuilder::getSingleFieldDisplay()
    */
   protected $singleFieldDisplays;
 
diff --git a/core/lib/Drupal/Core/Flood/MemoryBackend.php b/core/lib/Drupal/Core/Flood/MemoryBackend.php
index 9899e35e7e..da22bcb2c0 100644
--- a/core/lib/Drupal/Core/Flood/MemoryBackend.php
+++ b/core/lib/Drupal/Core/Flood/MemoryBackend.php
@@ -18,6 +18,8 @@ class MemoryBackend implements FloodInterface {
 
   /**
    * An array holding flood events, keyed by event name and identifier.
+   *
+   * @var array
    */
   protected $events = [];
 
diff --git a/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php
index eeaf510ea2..52d288306e 100644
--- a/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php
+++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php
@@ -40,7 +40,7 @@ class KeyValueFactory implements KeyValueFactoryInterface {
   protected $stores = [];
 
   /**
-   * var \Symfony\Component\DependencyInjection\ContainerInterface
+   * @var \Symfony\Component\DependencyInjection\ContainerInterface
    */
   protected $container;
 
diff --git a/core/lib/Drupal/Core/Locale/CountryManager.php b/core/lib/Drupal/Core/Locale/CountryManager.php
index adc110cae1..a4ba0e336b 100644
--- a/core/lib/Drupal/Core/Locale/CountryManager.php
+++ b/core/lib/Drupal/Core/Locale/CountryManager.php
@@ -18,6 +18,8 @@ class CountryManager implements CountryManagerInterface {
 
   /**
    * An array of country code => country name pairs.
+   *
+   * @var array
    */
   protected $countries;
 
diff --git a/core/lib/Drupal/Core/Menu/MenuLinkTreeElement.php b/core/lib/Drupal/Core/Menu/MenuLinkTreeElement.php
index f58dd913b2..3df8efb2d4 100644
--- a/core/lib/Drupal/Core/Menu/MenuLinkTreeElement.php
+++ b/core/lib/Drupal/Core/Menu/MenuLinkTreeElement.php
@@ -78,6 +78,8 @@ class MenuLinkTreeElement {
    * This is merged (\Drupal\Component\Utility\NestedArray::mergeDeep()) with
    * \Drupal\Core\Menu\MenuLinkInterface::getOptions(), to allow menu link tree
    * manipulators to add or override link options.
+   *
+   * @var array
    */
   public $options = [];
 
diff --git a/core/lib/Drupal/Core/Password/PhpassHashedPassword.php b/core/lib/Drupal/Core/Password/PhpassHashedPassword.php
index 0f938a0356..77e4f940f8 100644
--- a/core/lib/Drupal/Core/Password/PhpassHashedPassword.php
+++ b/core/lib/Drupal/Core/Password/PhpassHashedPassword.php
@@ -28,6 +28,8 @@ class PhpassHashedPassword implements PasswordInterface {
 
   /**
    * Returns a string for mapping an int to the corresponding base 64 character.
+   *
+   * @var string
    */
   public static $ITOA64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
 
@@ -35,6 +37,8 @@ class PhpassHashedPassword implements PasswordInterface {
    * Specifies the number of times the hashing function will be applied when
    * generating new password hashes. The number of times is calculated by
    * raising 2 to the power of the given value.
+   *
+   * @var int
    */
   protected $countLog2;
 
diff --git a/core/lib/Drupal/Core/Plugin/Context/ContextDefinition.php b/core/lib/Drupal/Core/Plugin/Context/ContextDefinition.php
index 1c252e2961..63e4038abd 100644
--- a/core/lib/Drupal/Core/Plugin/Context/ContextDefinition.php
+++ b/core/lib/Drupal/Core/Plugin/Context/ContextDefinition.php
@@ -17,7 +17,7 @@ class ContextDefinition implements ContextDefinitionInterface {
   /**
    * The data type of the data.
    *
-   * @return string
+   * @var string
    *   The data type.
    */
   protected $dataType;
@@ -25,7 +25,7 @@ class ContextDefinition implements ContextDefinitionInterface {
   /**
    * The human-readable label.
    *
-   * @return string
+   * @var string
    *   The label.
    */
   protected $label;
@@ -33,7 +33,7 @@ class ContextDefinition implements ContextDefinitionInterface {
   /**
    * The human-readable description.
    *
-   * @return string|null
+   * @var string|null
    *   The description, or NULL if no description is available.
    */
   protected $description;
diff --git a/core/lib/Drupal/Core/Render/Element/HtmlTag.php b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
index 98cf6363ee..05b243458c 100644
--- a/core/lib/Drupal/Core/Render/Element/HtmlTag.php
+++ b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
@@ -37,6 +37,8 @@ class HtmlTag extends RenderElement {
    * Void elements do not contain values or closing tags.
    * @see http://www.w3.org/TR/html5/syntax.html#syntax-start-tag
    * @see http://www.w3.org/TR/html5/syntax.html#void-elements
+   *
+   * @var array
    */
   static protected $voidElements = [
     'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input',
diff --git a/core/lib/Drupal/Core/Routing/UrlGenerator.php b/core/lib/Drupal/Core/Routing/UrlGenerator.php
index 92326ec42a..8b53947c40 100644
--- a/core/lib/Drupal/Core/Routing/UrlGenerator.php
+++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php
@@ -60,6 +60,8 @@ class UrlGenerator implements UrlGeneratorInterface {
    * and decoded characters.
    *
    * @see \Symfony\Component\Routing\Generator\UrlGenerator
+   *
+   * @var array
    */
   protected $decodedChars = [
     // the slash can be used to designate a hierarchical structure and we want allow using it with this meaning
diff --git a/core/lib/Drupal/Core/Session/SessionConfiguration.php b/core/lib/Drupal/Core/Session/SessionConfiguration.php
index 49dc63e915..93bb653463 100644
--- a/core/lib/Drupal/Core/Session/SessionConfiguration.php
+++ b/core/lib/Drupal/Core/Session/SessionConfiguration.php
@@ -11,6 +11,8 @@ class SessionConfiguration implements SessionConfigurationInterface {
 
   /**
    * An associative array of session ini settings.
+   *
+   * @var array
    */
   protected $options;
 
diff --git a/core/lib/Drupal/Core/Template/TwigSandboxPolicy.php b/core/lib/Drupal/Core/Template/TwigSandboxPolicy.php
index 5dfc4b5bc8..52b1091a05 100644
--- a/core/lib/Drupal/Core/Template/TwigSandboxPolicy.php
+++ b/core/lib/Drupal/Core/Template/TwigSandboxPolicy.php
@@ -17,17 +17,23 @@ class TwigSandboxPolicy implements \Twig_Sandbox_SecurityPolicyInterface {
 
   /**
    * An array of whitelisted methods in the form of methodName => TRUE.
+   *
+   * @var array
    */
   protected $whitelisted_methods = NULL;
 
   /**
    * An array of whitelisted method prefixes -- any method starting with one of
    * these prefixes will be allowed.
+   *
+   * @var array
    */
   protected $whitelisted_prefixes = NULL;
 
   /**
    * An array of class names for which any method calls are allowed.
+   *
+   * @var array
    */
   protected $whitelisted_classes = NULL;
 
diff --git a/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php b/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php
index f9f97ecaa8..671850b282 100644
--- a/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php
+++ b/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php
@@ -38,6 +38,8 @@
 
   /**
    * The config directories used in this test.
+   *
+   * @var array
    */
   protected $configDirectories = [];
 
diff --git a/core/lib/Drupal/Core/Utility/ThemeRegistry.php b/core/lib/Drupal/Core/Utility/ThemeRegistry.php
index fe80bdf105..e364874d36 100644
--- a/core/lib/Drupal/Core/Utility/ThemeRegistry.php
+++ b/core/lib/Drupal/Core/Utility/ThemeRegistry.php
@@ -24,11 +24,15 @@ class ThemeRegistry extends CacheCollector implements DestructableInterface {
    * This is only allowed if all modules and the request method is GET. _theme()
    * should be very rarely called on POST requests and this avoids polluting
    * the runtime cache.
+   *
+   * @var bool
    */
   protected $persistable;
 
   /**
    * The complete theme registry array.
+   *
+   * @var array
    */
   protected $completeRegistry;
 
diff --git a/core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php b/core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php
index c51551521a..5bf22462df 100644
--- a/core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php
+++ b/core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php
@@ -14,6 +14,8 @@ class BlockHiddenRegionTest extends BrowserTestBase {
 
   /**
    * An administrative user to configure the test environment.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   protected $adminUser;
 
diff --git a/core/modules/block/tests/src/Functional/BlockLanguageTest.php b/core/modules/block/tests/src/Functional/BlockLanguageTest.php
index cf1b87720a..e4abe2f2da 100644
--- a/core/modules/block/tests/src/Functional/BlockLanguageTest.php
+++ b/core/modules/block/tests/src/Functional/BlockLanguageTest.php
@@ -15,6 +15,8 @@ class BlockLanguageTest extends BrowserTestBase {
 
   /**
    * An administrative user to configure the test environment.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   protected $adminUser;
 
diff --git a/core/modules/block/tests/src/Functional/BlockUiTest.php b/core/modules/block/tests/src/Functional/BlockUiTest.php
index e6c187544e..169ed4649a 100644
--- a/core/modules/block/tests/src/Functional/BlockUiTest.php
+++ b/core/modules/block/tests/src/Functional/BlockUiTest.php
@@ -37,6 +37,8 @@ class BlockUiTest extends BrowserTestBase {
 
   /**
    * An administrative user to configure the test environment.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   protected $adminUser;
 
diff --git a/core/modules/block_content/src/Tests/BlockContentTestBase.php b/core/modules/block_content/src/Tests/BlockContentTestBase.php
index 3794478d52..f277f53d7f 100644
--- a/core/modules/block_content/src/Tests/BlockContentTestBase.php
+++ b/core/modules/block_content/src/Tests/BlockContentTestBase.php
@@ -16,6 +16,8 @@
 
   /**
    * Profile to use.
+   *
+   * @var string
    */
   protected $profile = 'testing';
 
diff --git a/core/modules/block_content/tests/src/Functional/BlockContentTestBase.php b/core/modules/block_content/tests/src/Functional/BlockContentTestBase.php
index 45c7e26999..1fdd0ef561 100644
--- a/core/modules/block_content/tests/src/Functional/BlockContentTestBase.php
+++ b/core/modules/block_content/tests/src/Functional/BlockContentTestBase.php
@@ -13,6 +13,8 @@
 
   /**
    * Profile to use.
+   *
+   * @var string
    */
   protected $profile = 'testing';
 
diff --git a/core/modules/comment/src/Entity/Comment.php b/core/modules/comment/src/Entity/Comment.php
index c2643fe025..233c752c59 100644
--- a/core/modules/comment/src/Entity/Comment.php
+++ b/core/modules/comment/src/Entity/Comment.php
@@ -73,6 +73,8 @@ class Comment extends ContentEntityBase implements CommentInterface {
 
   /**
    * The thread for which a lock was acquired.
+   *
+   * @var string
    */
   protected $threadLock = '';
 
diff --git a/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php b/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php
index 702148867a..8adf252000 100644
--- a/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php
+++ b/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php
@@ -78,7 +78,7 @@ public static function defaultSettings() {
   protected $entityFormBuilder;
 
   /**
-   * @param \Drupal\Core\Routing\RouteMatchInterface $routeMatch
+   * @var \Drupal\Core\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
diff --git a/core/modules/comment/src/Plugin/views/wizard/Comment.php b/core/modules/comment/src/Plugin/views/wizard/Comment.php
index a74168d096..2f12460eeb 100644
--- a/core/modules/comment/src/Plugin/views/wizard/Comment.php
+++ b/core/modules/comment/src/Plugin/views/wizard/Comment.php
@@ -21,11 +21,15 @@ class Comment extends WizardPluginBase {
 
   /**
    * Set the created column.
+   *
+   * @var string
    */
   protected $createdColumn = 'created';
 
   /**
    * Set default values for the filters.
+   *
+   * @var array
    */
   protected $filters = [
     'status_node' => [
diff --git a/core/modules/comment/tests/src/Functional/CommentTranslationUITest.php b/core/modules/comment/tests/src/Functional/CommentTranslationUITest.php
index daac938fa3..705a71f31d 100644
--- a/core/modules/comment/tests/src/Functional/CommentTranslationUITest.php
+++ b/core/modules/comment/tests/src/Functional/CommentTranslationUITest.php
@@ -18,6 +18,8 @@ class CommentTranslationUITest extends ContentTranslationUITestBase {
 
   /**
    * The subject of the test comment.
+   *
+   * @var string
    */
   protected $subject;
 
@@ -30,6 +32,8 @@ class CommentTranslationUITest extends ContentTranslationUITestBase {
 
   /**
    * {inheritdoc}
+   *
+   * @var array
    */
   protected $defaultCacheContexts = [
     'languages:language_interface',
diff --git a/core/modules/config/tests/src/Functional/ConfigInstallWebTest.php b/core/modules/config/tests/src/Functional/ConfigInstallWebTest.php
index 5dc3119dfb..34812ebb10 100644
--- a/core/modules/config/tests/src/Functional/ConfigInstallWebTest.php
+++ b/core/modules/config/tests/src/Functional/ConfigInstallWebTest.php
@@ -17,6 +17,8 @@ class ConfigInstallWebTest extends BrowserTestBase {
 
   /**
    * The admin user used in this test.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   protected $adminUser;
 
diff --git a/core/modules/config_translation/src/ConfigNamesMapper.php b/core/modules/config_translation/src/ConfigNamesMapper.php
index 03716e9725..f1f8652f86 100644
--- a/core/modules/config_translation/src/ConfigNamesMapper.php
+++ b/core/modules/config_translation/src/ConfigNamesMapper.php
@@ -61,7 +61,7 @@ class ConfigNamesMapper extends PluginBase implements ConfigMapperInterface, Con
   /**
    * The base route object that the mapper is attached to.
    *
-   * @return \Symfony\Component\Routing\Route
+   * @var \Symfony\Component\Routing\Route
    */
   protected $baseRoute;
 
diff --git a/core/modules/config_translation/src/Controller/ConfigTranslationController.php b/core/modules/config_translation/src/Controller/ConfigTranslationController.php
index 8d9bfe7bde..a8c426ae0e 100644
--- a/core/modules/config_translation/src/Controller/ConfigTranslationController.php
+++ b/core/modules/config_translation/src/Controller/ConfigTranslationController.php
@@ -62,7 +62,7 @@ class ConfigTranslationController extends ControllerBase {
   /**
    * The language manager.
    *
-   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
+   * @var \Drupal\Core\Language\LanguageManagerInterface
    */
   protected $languageManager;
 
diff --git a/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php b/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php
index 92f51a8286..5ee72ee2ad 100644
--- a/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php
+++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php
@@ -13,6 +13,8 @@
 
   /**
    * Profile to use.
+   *
+   * @var string
    */
   protected $profile = 'testing';
 
diff --git a/core/modules/datetime/tests/src/Kernel/Views/FilterDateTest.php b/core/modules/datetime/tests/src/Kernel/Views/FilterDateTest.php
index 23f40948e8..47a3ca54cd 100644
--- a/core/modules/datetime/tests/src/Kernel/Views/FilterDateTest.php
+++ b/core/modules/datetime/tests/src/Kernel/Views/FilterDateTest.php
@@ -22,6 +22,8 @@ class FilterDateTest extends DateTimeHandlerTestBase {
 
   /**
    * For offset tests, set to the current time.
+   *
+   * @var string
    */
   protected static $date;
 
diff --git a/core/modules/datetime/tests/src/Kernel/Views/FilterDateTimeTest.php b/core/modules/datetime/tests/src/Kernel/Views/FilterDateTimeTest.php
index f9f9d8b025..66a16168ac 100644
--- a/core/modules/datetime/tests/src/Kernel/Views/FilterDateTimeTest.php
+++ b/core/modules/datetime/tests/src/Kernel/Views/FilterDateTimeTest.php
@@ -20,11 +20,15 @@ class FilterDateTimeTest extends DateTimeHandlerTestBase {
 
   /**
    * For offset tests, set a date 1 day in the future.
+   *
+   * @var string
    */
   protected static $date;
 
   /**
    * Use a non-UTC timezone.
+   *
+   * @var string
    */
   protected static $timezone = 'America/Vancouver';
 
diff --git a/core/modules/dblog/src/Plugin/views/wizard/Watchdog.php b/core/modules/dblog/src/Plugin/views/wizard/Watchdog.php
index f1d7bffb5d..3a0dad5c86 100644
--- a/core/modules/dblog/src/Plugin/views/wizard/Watchdog.php
+++ b/core/modules/dblog/src/Plugin/views/wizard/Watchdog.php
@@ -18,6 +18,8 @@ class Watchdog extends WizardPluginBase {
 
   /**
    * Set the created column.
+   *
+   * @var string
    */
   protected $createdColumn = 'timestamp';
 
diff --git a/core/modules/field/tests/src/Functional/FieldHelpTest.php b/core/modules/field/tests/src/Functional/FieldHelpTest.php
index 9a6ff67820..ffe0e78a94 100644
--- a/core/modules/field/tests/src/Functional/FieldHelpTest.php
+++ b/core/modules/field/tests/src/Functional/FieldHelpTest.php
@@ -23,6 +23,8 @@ class FieldHelpTest extends BrowserTestBase {
 
   /**
    * The admin user that will be created.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   protected $adminUser;
 
diff --git a/core/modules/file/src/Plugin/views/wizard/File.php b/core/modules/file/src/Plugin/views/wizard/File.php
index 1a43f8c388..f870f6576a 100644
--- a/core/modules/file/src/Plugin/views/wizard/File.php
+++ b/core/modules/file/src/Plugin/views/wizard/File.php
@@ -17,6 +17,8 @@ class File extends WizardPluginBase {
 
   /**
    * Set the created column.
+   *
+   * @var string
    */
   protected $createdColumn = 'created';
 
diff --git a/core/modules/file/src/Tests/SaveUploadFormTest.php b/core/modules/file/src/Tests/SaveUploadFormTest.php
index 6d51198a7f..50779923e4 100644
--- a/core/modules/file/src/Tests/SaveUploadFormTest.php
+++ b/core/modules/file/src/Tests/SaveUploadFormTest.php
@@ -29,11 +29,15 @@ class SaveUploadFormTest extends FileManagedTestBase {
 
   /**
    * A PHP file path for upload security testing.
+   *
+   * @var object
    */
   protected $phpfile;
 
   /**
    * The largest file id when the test starts.
+   *
+   * @var int
    */
   protected $maxFidBefore;
 
diff --git a/core/modules/file/src/Tests/SaveUploadTest.php b/core/modules/file/src/Tests/SaveUploadTest.php
index a9f69c2fb7..6dee7726f9 100644
--- a/core/modules/file/src/Tests/SaveUploadTest.php
+++ b/core/modules/file/src/Tests/SaveUploadTest.php
@@ -26,11 +26,15 @@ class SaveUploadTest extends FileManagedTestBase {
 
   /**
    * A PHP file path for upload security testing.
+   *
+   * @var object
    */
   protected $phpfile;
 
   /**
    * The largest file id when the test starts.
+   *
+   * @var int
    */
   protected $maxFidBefore;
 
diff --git a/core/modules/file/src/Tests/Update/FileUpdateTest.php b/core/modules/file/src/Tests/Update/FileUpdateTest.php
index bd724f41b0..c9c61f0854 100644
--- a/core/modules/file/src/Tests/Update/FileUpdateTest.php
+++ b/core/modules/file/src/Tests/Update/FileUpdateTest.php
@@ -12,7 +12,7 @@
 class FileUpdateTest extends UpdatePathTestBase {
 
   /**
-   * Modules to enable after the database is loaded.
+   * {@inheritdoc}
    */
   protected static $modules = ['file'];
 
diff --git a/core/modules/forum/tests/src/Functional/ForumBlockTest.php b/core/modules/forum/tests/src/Functional/ForumBlockTest.php
index b231f6d0ea..867aa562c7 100644
--- a/core/modules/forum/tests/src/Functional/ForumBlockTest.php
+++ b/core/modules/forum/tests/src/Functional/ForumBlockTest.php
@@ -22,6 +22,8 @@ class ForumBlockTest extends BrowserTestBase {
 
   /**
    * A user with various administrative privileges.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   protected $adminUser;
 
diff --git a/core/modules/forum/tests/src/Functional/ForumTest.php b/core/modules/forum/tests/src/Functional/ForumTest.php
index 9ba4be7b2a..9fd6d6f699 100644
--- a/core/modules/forum/tests/src/Functional/ForumTest.php
+++ b/core/modules/forum/tests/src/Functional/ForumTest.php
@@ -29,46 +29,64 @@ class ForumTest extends BrowserTestBase {
 
   /**
    * A user with various administrative privileges.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   protected $adminUser;
 
   /**
    * A user that can create forum topics and edit its own topics.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   protected $editOwnTopicsUser;
 
   /**
    * A user that can create, edit, and delete forum topics.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   protected $editAnyTopicsUser;
 
   /**
    * A user with no special privileges.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   protected $webUser;
 
   /**
    * An administrative user who can bypass comment approval.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   protected $postCommentUser;
 
   /**
    * An array representing a forum container.
+   *
+   * @var array
    */
   protected $forumContainer;
 
   /**
    * An array representing a forum.
+   *
+   * @var array
    */
   protected $forum;
 
   /**
    * An array representing a root forum.
+   *
+   * @var array
    */
   protected $rootForum;
 
   /**
    * An array of forum topic node IDs.
+   *
+   * @var array
    */
   protected $nids;
 
diff --git a/core/modules/help/tests/src/Functional/HelpTest.php b/core/modules/help/tests/src/Functional/HelpTest.php
index e70eeb7665..f4c3a74705 100644
--- a/core/modules/help/tests/src/Functional/HelpTest.php
+++ b/core/modules/help/tests/src/Functional/HelpTest.php
@@ -24,16 +24,22 @@ class HelpTest extends BrowserTestBase {
 
   /**
    * Use the Standard profile to test help implementations of many core modules.
+   *
+   * @var string
    */
   protected $profile = 'standard';
 
   /**
    * The admin user that will be created.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   protected $adminUser;
 
   /**
    * The anonymous user that will be created.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   protected $anyUser;
 
diff --git a/core/modules/help/tests/src/Functional/NoHelpTest.php b/core/modules/help/tests/src/Functional/NoHelpTest.php
index acb2563aee..1fe2e643a7 100644
--- a/core/modules/help/tests/src/Functional/NoHelpTest.php
+++ b/core/modules/help/tests/src/Functional/NoHelpTest.php
@@ -22,6 +22,8 @@ class NoHelpTest extends BrowserTestBase {
 
   /**
    * The user who will be created.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   protected $adminUser;
 
diff --git a/core/modules/language/src/EventSubscriber/LanguageRequestSubscriber.php b/core/modules/language/src/EventSubscriber/LanguageRequestSubscriber.php
index 3df20c559f..b1effda1db 100644
--- a/core/modules/language/src/EventSubscriber/LanguageRequestSubscriber.php
+++ b/core/modules/language/src/EventSubscriber/LanguageRequestSubscriber.php
@@ -41,7 +41,7 @@ class LanguageRequestSubscriber implements EventSubscriberInterface {
   /**
    * The current active user.
    *
-   * @return \Drupal\Core\Session\AccountInterface
+   * @var \Drupal\Core\Session\AccountInterface
    */
   protected $currentUser;
 
diff --git a/core/modules/language/src/LanguageNegotiationMethodBase.php b/core/modules/language/src/LanguageNegotiationMethodBase.php
index d4cca6a7a7..8e74840d48 100644
--- a/core/modules/language/src/LanguageNegotiationMethodBase.php
+++ b/core/modules/language/src/LanguageNegotiationMethodBase.php
@@ -28,7 +28,7 @@
   /**
    * The current active user.
    *
-   * @return \Drupal\Core\Session\AccountInterface
+   * @var \Drupal\Core\Session\AccountInterface
    */
   protected $currentUser;
 
diff --git a/core/modules/language/src/LanguageNegotiator.php b/core/modules/language/src/LanguageNegotiator.php
index a236a48d62..17df4ff9eb 100644
--- a/core/modules/language/src/LanguageNegotiator.php
+++ b/core/modules/language/src/LanguageNegotiator.php
@@ -38,7 +38,7 @@ class LanguageNegotiator implements LanguageNegotiatorInterface {
   /**
    * The settings instance.
    *
-   * @return \Drupal\Core\Site\Settings
+   * @var \Drupal\Core\Site\Settings
    */
   protected $settings;
 
@@ -52,7 +52,7 @@ class LanguageNegotiator implements LanguageNegotiatorInterface {
   /**
    * The current active user.
    *
-   * @return \Drupal\Core\Session\AccountInterface
+   * @var \Drupal\Core\Session\AccountInterface
    */
   protected $currentUser;
 
diff --git a/core/modules/locale/tests/src/Functional/LocaleExportTest.php b/core/modules/locale/tests/src/Functional/LocaleExportTest.php
index 05621f6c13..c67cb2ad69 100644
--- a/core/modules/locale/tests/src/Functional/LocaleExportTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleExportTest.php
@@ -20,6 +20,8 @@ class LocaleExportTest extends BrowserTestBase {
 
   /**
    * A user able to create languages and export translations.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   protected $adminUser = NULL;
 
diff --git a/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php b/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php
index a2ba9930fc..68862f3628 100644
--- a/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php
+++ b/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php
@@ -14,6 +14,8 @@ class MenuLinkContentTranslationUITest extends ContentTranslationUITestBase {
 
   /**
    * {inheritdoc}
+   *
+   * @var array
    */
   protected $defaultCacheContexts = ['languages:language_interface', 'session', 'theme', 'url.path', 'url.query_args', 'user.permissions', 'user.roles:authenticated'];
 
diff --git a/core/modules/migrate/tests/src/Unit/MigrationPluginManagerTest.php b/core/modules/migrate/tests/src/Unit/MigrationPluginManagerTest.php
index 9dbe850148..259254739f 100644
--- a/core/modules/migrate/tests/src/Unit/MigrationPluginManagerTest.php
+++ b/core/modules/migrate/tests/src/Unit/MigrationPluginManagerTest.php
@@ -15,7 +15,7 @@ class MigrationPluginManagerTest extends UnitTestCase {
   /**
    * A plugin manager.
    *
-   * @param \Drupal\migrate\Plugin\MigrationPluginManager $pluginManager
+   * @var \Drupal\migrate\Plugin\MigrationPluginManager
    */
   protected $pluginManager;
 
diff --git a/core/modules/migrate/tests/src/Unit/process/UrlEncodeTest.php b/core/modules/migrate/tests/src/Unit/process/UrlEncodeTest.php
index df41e82840..570dacdd65 100644
--- a/core/modules/migrate/tests/src/Unit/process/UrlEncodeTest.php
+++ b/core/modules/migrate/tests/src/Unit/process/UrlEncodeTest.php
@@ -15,6 +15,8 @@ class UrlEncodeTest extends MigrateTestCase {
 
   /**
    * @inheritdoc
+   *
+   * @var array
    */
   protected $migrationConfiguration = [
     'id' => 'test',
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/DrupalSqlBaseTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/DrupalSqlBaseTest.php
index ebd9334a2d..61ff1baff2 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/DrupalSqlBaseTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/DrupalSqlBaseTest.php
@@ -13,6 +13,8 @@ class DrupalSqlBaseTest extends MigrateTestCase {
 
   /**
    * Define bare minimum migration configuration.
+   *
+   * @var array
    */
   protected $migrationConfiguration = [
     'id' => 'DrupalSqlBase',
@@ -25,6 +27,8 @@ class DrupalSqlBaseTest extends MigrateTestCase {
 
   /**
    * Minimum database contents needed to test DrupalSqlBase.
+   *
+   * @var array
    */
   protected $databaseContents = [
     'system' => [
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php
index e8866d6f10..c0ca683f65 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php
@@ -18,6 +18,8 @@ class Drupal6SqlBaseTest extends MigrateTestCase {
 
   /**
    * Define bare minimum migration configuration.
+   *
+   * @var array
    */
   protected $migrationConfiguration = [
     'id' => 'Drupal6SqlBase',
@@ -30,6 +32,8 @@ class Drupal6SqlBaseTest extends MigrateTestCase {
 
   /**
    * Minimum database contents needed to test Drupal6SqlBase.
+   *
+   * @var array
    */
   protected $databaseContents = [
     'system' => [
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/VariableTranslationTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/VariableTranslationTest.php
index 152706798c..bfcd084f30 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/VariableTranslationTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/VariableTranslationTest.php
@@ -17,6 +17,8 @@ class VariableTranslationTest extends MigrateSqlSourceTestCase {
 
   /**
    * Define bare minimum migration configuration.
+   *
+   * @var array
    */
   protected $migrationConfiguration = [
     'id' => 'test',
@@ -32,6 +34,8 @@ class VariableTranslationTest extends MigrateSqlSourceTestCase {
 
   /**
    * Expected results from the source.
+   *
+   * @var array
    */
   protected $expectedResults = [
     [
@@ -48,6 +52,8 @@ class VariableTranslationTest extends MigrateSqlSourceTestCase {
 
   /**
    * Database contents for tests.
+   *
+   * @var array
    */
   protected $databaseContents = [
     'i18n_variable' => [
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/i18nVariableTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/i18nVariableTest.php
index d1905b0e6c..6351b60882 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/i18nVariableTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/i18nVariableTest.php
@@ -18,6 +18,8 @@ class i18nVariableTest extends MigrateSqlSourceTestCase {
 
   /**
    * Define bare minimum migration configuration.
+   *
+   * @var array
    */
   protected $migrationConfiguration = [
     'id' => 'test',
@@ -33,6 +35,8 @@ class i18nVariableTest extends MigrateSqlSourceTestCase {
 
   /**
    * Expected results from the source.
+   *
+   * @var array
    */
   protected $expectedResults = [
     [
@@ -49,6 +53,8 @@ class i18nVariableTest extends MigrateSqlSourceTestCase {
 
   /**
    * Database contents for tests.
+   *
+   * @var array
    */
   protected $databaseContents = [
     'i18n_variable' => [
diff --git a/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php b/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php
index f785a572b3..0e01c232e7 100644
--- a/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php
+++ b/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php
@@ -20,6 +20,8 @@
 
   /**
    * Use the Standard profile to test help implementations of many core modules.
+   *
+   * @var string
    */
   protected $profile = 'standard';
 
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
index 09dc9691e3..d5cc93908a 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
@@ -15,6 +15,8 @@
 
   /**
    * Use the Standard profile to test help implementations of many core modules.
+   *
+   * @var string
    */
   protected $profile = 'standard';
 
diff --git a/core/modules/node/src/Plugin/views/wizard/Node.php b/core/modules/node/src/Plugin/views/wizard/Node.php
index 1be211fef5..c9929c51f4 100644
--- a/core/modules/node/src/Plugin/views/wizard/Node.php
+++ b/core/modules/node/src/Plugin/views/wizard/Node.php
@@ -22,6 +22,8 @@ class Node extends WizardPluginBase {
 
   /**
    * Set the created column.
+   *
+   * @var string
    */
   protected $createdColumn = 'node_field_data-created';
 
diff --git a/core/modules/node/src/Plugin/views/wizard/NodeRevision.php b/core/modules/node/src/Plugin/views/wizard/NodeRevision.php
index 258d6d3237..d7088eb7b4 100644
--- a/core/modules/node/src/Plugin/views/wizard/NodeRevision.php
+++ b/core/modules/node/src/Plugin/views/wizard/NodeRevision.php
@@ -21,6 +21,8 @@ class NodeRevision extends WizardPluginBase {
 
   /**
    * Set the created column.
+   *
+   * @var string
    */
   protected $createdColumn = 'changed';
 
diff --git a/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php b/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
index d9e4e8b092..f7b9fb3b1c 100644
--- a/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
+++ b/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
@@ -50,6 +50,8 @@ class NodeAccessBaseTableTest extends NodeTestBase {
 
   /**
    * A web user.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   protected $webUser;
 
diff --git a/core/modules/node/tests/src/Functional/NodeAccessGrantsCacheContextTest.php b/core/modules/node/tests/src/Functional/NodeAccessGrantsCacheContextTest.php
index fa2116ab87..b6919aa268 100644
--- a/core/modules/node/tests/src/Functional/NodeAccessGrantsCacheContextTest.php
+++ b/core/modules/node/tests/src/Functional/NodeAccessGrantsCacheContextTest.php
@@ -19,11 +19,15 @@ class NodeAccessGrantsCacheContextTest extends NodeTestBase {
 
   /**
    * User with permission to view content.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   protected $accessUser;
 
   /**
    * User without permission to view content.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   protected $noAccessUser;
 
diff --git a/core/modules/node/tests/src/Functional/NodeEntityViewModeAlterTest.php b/core/modules/node/tests/src/Functional/NodeEntityViewModeAlterTest.php
index be0f1c0623..8476e2d802 100644
--- a/core/modules/node/tests/src/Functional/NodeEntityViewModeAlterTest.php
+++ b/core/modules/node/tests/src/Functional/NodeEntityViewModeAlterTest.php
@@ -16,6 +16,8 @@ class NodeEntityViewModeAlterTest extends NodeTestBase {
 
   /**
    * Enable dummy module that implements hook_ENTITY_TYPE_view() for nodes.
+   *
+   * @var array
    */
   public static $modules = ['node_test'];
 
diff --git a/core/modules/node/tests/src/Functional/NodeQueryAlterTest.php b/core/modules/node/tests/src/Functional/NodeQueryAlterTest.php
index 362a27fc48..181183f717 100644
--- a/core/modules/node/tests/src/Functional/NodeQueryAlterTest.php
+++ b/core/modules/node/tests/src/Functional/NodeQueryAlterTest.php
@@ -18,11 +18,15 @@ class NodeQueryAlterTest extends NodeTestBase {
 
   /**
    * User with permission to view content.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   protected $accessUser;
 
   /**
    * User without permission to view content.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   protected $noAccessUser;
 
diff --git a/core/modules/node/tests/src/Functional/NodeTranslationUITest.php b/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
index fa0ad13b3c..cb36c54d0f 100644
--- a/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
+++ b/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
@@ -18,6 +18,8 @@ class NodeTranslationUITest extends ContentTranslationUITestBase {
 
   /**
    * {inheritdoc}
+   *
+   * @var array
    */
   protected $defaultCacheContexts = [
     'languages:language_interface',
diff --git a/core/modules/rest/tests/src/Functional/Views/StyleSerializerTest.php b/core/modules/rest/tests/src/Functional/Views/StyleSerializerTest.php
index 6de1ec97ce..266be21fd2 100644
--- a/core/modules/rest/tests/src/Functional/Views/StyleSerializerTest.php
+++ b/core/modules/rest/tests/src/Functional/Views/StyleSerializerTest.php
@@ -47,6 +47,8 @@ class StyleSerializerTest extends ViewTestBase {
 
   /**
    * A user with administrative privileges to look at test entity and configure views.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   protected $adminUser;
 
diff --git a/core/modules/rest/tests/src/Unit/CollectRoutesTest.php b/core/modules/rest/tests/src/Unit/CollectRoutesTest.php
index e171e047c8..851cf5ec26 100644
--- a/core/modules/rest/tests/src/Unit/CollectRoutesTest.php
+++ b/core/modules/rest/tests/src/Unit/CollectRoutesTest.php
@@ -24,6 +24,8 @@ class CollectRoutesTest extends UnitTestCase {
 
   /**
    * The RouteCollection.
+   *
+   * @var \Symfony\Component\Routing\RouteCollection
    */
   protected $routes;
 
diff --git a/core/modules/search/src/Plugin/views/filter/Search.php b/core/modules/search/src/Plugin/views/filter/Search.php
index b1884d5ac3..d387d538ea 100644
--- a/core/modules/search/src/Plugin/views/filter/Search.php
+++ b/core/modules/search/src/Plugin/views/filter/Search.php
@@ -34,6 +34,8 @@ class Search extends FilterPluginBase {
 
   /**
    * TRUE if the search query has been parsed.
+   *
+   * @var bool
    */
   protected $parsed = FALSE;
 
diff --git a/core/modules/shortcut/tests/src/Functional/ShortcutTranslationUITest.php b/core/modules/shortcut/tests/src/Functional/ShortcutTranslationUITest.php
index 83bf47a495..da5eaccd3f 100644
--- a/core/modules/shortcut/tests/src/Functional/ShortcutTranslationUITest.php
+++ b/core/modules/shortcut/tests/src/Functional/ShortcutTranslationUITest.php
@@ -15,6 +15,8 @@ class ShortcutTranslationUITest extends ContentTranslationUITestBase {
 
   /**
    * {inheritdoc}
+   *
+   * @var array
    */
   protected $defaultCacheContexts = ['languages:language_interface', 'session', 'theme', 'user', 'url.path', 'url.query_args', 'url.site'];
 
diff --git a/core/modules/simpletest/src/TestBase.php b/core/modules/simpletest/src/TestBase.php
index a3fd1788d6..67fcc97b4a 100644
--- a/core/modules/simpletest/src/TestBase.php
+++ b/core/modules/simpletest/src/TestBase.php
@@ -45,6 +45,8 @@
 
   /**
    * Time limit for the test.
+   *
+   * @var int
    */
   protected $timeLimit = 500;
 
@@ -74,6 +76,8 @@
    * to see "WebTestBase->drupalLogin()', we would like to see the test
    * that called it. So we need to skip the classes defining these helper
    * methods.
+   *
+   * @var array
    */
   protected $skipClasses = [__CLASS__ => TRUE];
 
diff --git a/core/modules/simpletest/src/Tests/InstallationProfileModuleTestsTest.php b/core/modules/simpletest/src/Tests/InstallationProfileModuleTestsTest.php
index 379aed4499..5d9c229262 100644
--- a/core/modules/simpletest/src/Tests/InstallationProfileModuleTestsTest.php
+++ b/core/modules/simpletest/src/Tests/InstallationProfileModuleTestsTest.php
@@ -36,6 +36,8 @@ class InstallationProfileModuleTestsTest extends WebTestBase {
    *   contained in the Testing profile.
    *
    * @see \Drupal\drupal_system_listing_compatible_test\Tests\SystemListingCompatibleTest
+   *
+   * @var string
    */
   protected $profile = 'testing';
 
diff --git a/core/modules/simpletest/src/Tests/SimpleTestTest.php b/core/modules/simpletest/src/Tests/SimpleTestTest.php
index 42759c255a..f8f048df76 100644
--- a/core/modules/simpletest/src/Tests/SimpleTestTest.php
+++ b/core/modules/simpletest/src/Tests/SimpleTestTest.php
@@ -33,6 +33,8 @@ class SimpleTestTest extends WebTestBase {
    * Stores the test ID from each test run for comparison.
    *
    * Used to ensure they are incrementing.
+   *
+   * @var array
    */
   protected $testIds = [];
 
diff --git a/core/modules/simpletest/src/Tests/TimeZoneTest.php b/core/modules/simpletest/src/Tests/TimeZoneTest.php
index 9a98c79020..ba5af8e7dc 100644
--- a/core/modules/simpletest/src/Tests/TimeZoneTest.php
+++ b/core/modules/simpletest/src/Tests/TimeZoneTest.php
@@ -13,6 +13,8 @@ class TimeZoneTest extends WebTestBase {
 
   /**
    * A user with administrative privileges.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   protected $adminUser;
 
diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php
index 22cd768187..1e16afb780 100644
--- a/core/modules/simpletest/src/WebTestBase.php
+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -97,7 +97,7 @@
   /**
    * The headers of the page currently loaded in the internal browser.
    *
-   * @var Array
+   * @var array
    */
   protected $headers;
 
@@ -130,6 +130,8 @@
    *
    * We do not reuse the cookies in further runs, so we do not need a file
    * but we still need cookie handling, so we set the jar to NULL.
+   *
+   * @var string|null
    */
   protected $cookieFile = NULL;
 
@@ -138,6 +140,8 @@
    *
    * \Drupal\simpletest\WebTestBase itself never sets this but always obeys what
    * is set.
+   *
+   * @var array
    */
   protected $additionalCurlOptions = [];
 
@@ -164,16 +168,22 @@
 
   /**
    * The current session ID, if available.
+   *
+   * @var string
    */
   protected $sessionId = NULL;
 
   /**
    * The maximum number of redirects to follow when handling responses.
+   *
+   * @var int
    */
   protected $maximumRedirects = 5;
 
   /**
    * The number of redirects followed during the handling of a request.
+   *
+   * @var int
    */
   protected $redirectCount;
 
diff --git a/core/modules/simpletest/tests/src/Functional/OtherInstallationProfileTestsTest.php b/core/modules/simpletest/tests/src/Functional/OtherInstallationProfileTestsTest.php
index 09ec7b4dbc..ceb7d57f72 100644
--- a/core/modules/simpletest/tests/src/Functional/OtherInstallationProfileTestsTest.php
+++ b/core/modules/simpletest/tests/src/Functional/OtherInstallationProfileTestsTest.php
@@ -28,6 +28,8 @@ class OtherInstallationProfileTestsTest extends BrowserTestBase {
    * The Standard profile contains \Drupal\standard\Tests\StandardTest, which
    * should be found.
    *
+   * @var string
+   *
    * @see \Drupal\simpletest\Tests\InstallationProfileModuleTestsTest
    * @see \Drupal\drupal_system_listing_compatible_test\Tests\SystemListingCompatibleTest
    */
diff --git a/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php b/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php
index 10eda61845..c6ae012d90 100644
--- a/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php
+++ b/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php
@@ -72,7 +72,7 @@ class EntityFilteringThemeTest extends WebTestBase {
   /**
    * A string containing markup and JS.
    *
-   * @string
+   * @var string
    */
   protected $xssLabel = "string with <em>HTML</em> and <script>alert('JS');</script>";
 
diff --git a/core/modules/system/src/Tests/Update/UpdatePathTestBase.php b/core/modules/system/src/Tests/Update/UpdatePathTestBase.php
index 05719fb6d4..c815386b5a 100644
--- a/core/modules/system/src/Tests/Update/UpdatePathTestBase.php
+++ b/core/modules/system/src/Tests/Update/UpdatePathTestBase.php
@@ -48,6 +48,8 @@
 
   /**
    * Modules to enable after the database is loaded.
+   *
+   * @var array
    */
   protected static $modules = [];
 
diff --git a/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php b/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php
index 99fe192308..309a08c388 100644
--- a/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php
+++ b/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php
@@ -17,6 +17,8 @@ class ThemeTestSubscriber implements EventSubscriberInterface {
   /**
    * The used container.
    *
+   * @var \Symfony\Component\DependencyInjection\ContainerInterface
+   *
    * @todo This variable is never initialzed, so we don't know what it is.
    *   See https://www.drupal.org/node/2721315
    */
diff --git a/core/modules/system/tests/src/Functional/Datetime/DrupalDateTimeTest.php b/core/modules/system/tests/src/Functional/Datetime/DrupalDateTimeTest.php
index d2114fdf8e..62b40740a7 100644
--- a/core/modules/system/tests/src/Functional/Datetime/DrupalDateTimeTest.php
+++ b/core/modules/system/tests/src/Functional/Datetime/DrupalDateTimeTest.php
@@ -15,6 +15,8 @@ class DrupalDateTimeTest extends BrowserTestBase {
 
   /**
    * Set up required modules.
+   *
+   * @var array
    */
   public static $modules = [];
 
diff --git a/core/modules/system/tests/src/Functional/FileTransfer/TestFileTransfer.php b/core/modules/system/tests/src/Functional/FileTransfer/TestFileTransfer.php
index 2f233be5d1..48e57845dd 100644
--- a/core/modules/system/tests/src/Functional/FileTransfer/TestFileTransfer.php
+++ b/core/modules/system/tests/src/Functional/FileTransfer/TestFileTransfer.php
@@ -16,6 +16,8 @@ class TestFileTransfer extends FileTransfer {
 
   /**
    * This is for testing the CopyRecursive logic.
+   *
+   * @var bool
    */
   public $shouldIsDirectoryReturnTrue = FALSE;
 
diff --git a/core/modules/system/tests/src/Functional/Form/StateValuesCleanAdvancedTest.php b/core/modules/system/tests/src/Functional/Form/StateValuesCleanAdvancedTest.php
index 63d8e70c30..2214bfef7f 100644
--- a/core/modules/system/tests/src/Functional/Form/StateValuesCleanAdvancedTest.php
+++ b/core/modules/system/tests/src/Functional/Form/StateValuesCleanAdvancedTest.php
@@ -27,6 +27,8 @@ class StateValuesCleanAdvancedTest extends BrowserTestBase {
 
   /**
    * An image file path for uploading.
+   *
+   * @var object
    */
   protected $image;
 
diff --git a/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php b/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
index e9142dc853..5a17d47419 100644
--- a/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
+++ b/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
@@ -39,6 +39,8 @@ class BreadcrumbTest extends BrowserTestBase {
 
   /**
    * Test paths in the Standard profile.
+   *
+   * @var string
    */
   protected $profile = 'standard';
 
diff --git a/core/modules/system/tests/src/Functional/Module/ClassLoaderTest.php b/core/modules/system/tests/src/Functional/Module/ClassLoaderTest.php
index 779a288a7b..93c0bf3f42 100644
--- a/core/modules/system/tests/src/Functional/Module/ClassLoaderTest.php
+++ b/core/modules/system/tests/src/Functional/Module/ClassLoaderTest.php
@@ -13,6 +13,8 @@ class ClassLoaderTest extends BrowserTestBase {
 
   /**
    * The expected result from calling the module-provided class' method.
+   *
+   * @var string
    */
   protected $expected = 'Drupal\\module_autoload_test\\SomeClass::testMethod() was invoked.';
 
diff --git a/core/modules/system/tests/src/Functional/Routing/MockMatcher.php b/core/modules/system/tests/src/Functional/Routing/MockMatcher.php
index eee6b13952..0313acb226 100644
--- a/core/modules/system/tests/src/Functional/Routing/MockMatcher.php
+++ b/core/modules/system/tests/src/Functional/Routing/MockMatcher.php
@@ -12,6 +12,8 @@ class MockMatcher implements RequestMatcherInterface {
 
   /**
    * The matcher being tested.
+   *
+   * @var \Closure
    */
   protected $matcher;
 
diff --git a/core/modules/system/tests/src/Functional/Update/UpdatesWith7xTest.php b/core/modules/system/tests/src/Functional/Update/UpdatesWith7xTest.php
index 2452264e37..5920eb2955 100644
--- a/core/modules/system/tests/src/Functional/Update/UpdatesWith7xTest.php
+++ b/core/modules/system/tests/src/Functional/Update/UpdatesWith7xTest.php
@@ -21,11 +21,15 @@ class UpdatesWith7xTest extends BrowserTestBase {
 
   /**
    * The URL for the update page.
+   *
+   * @var string
    */
   private $updateUrl;
 
   /**
    * An administrative user.
+   *
+   * @var \Drupal\user\Entity\User|false
    */
   private $updateUser;
 
diff --git a/core/modules/user/src/Plugin/views/wizard/Users.php b/core/modules/user/src/Plugin/views/wizard/Users.php
index 081a509a2d..cd12c803f8 100644
--- a/core/modules/user/src/Plugin/views/wizard/Users.php
+++ b/core/modules/user/src/Plugin/views/wizard/Users.php
@@ -21,11 +21,15 @@ class Users extends WizardPluginBase {
 
   /**
    * Set the created column.
+   *
+   * @var string
    */
   protected $createdColumn = 'created';
 
   /**
    * Set default values for the filters.
+   *
+   * @var array
    */
   protected $filters = [
     'status' => [
diff --git a/core/modules/views/src/Annotation/ViewsDisplay.php b/core/modules/views/src/Annotation/ViewsDisplay.php
index 85887e352d..5821026c51 100644
--- a/core/modules/views/src/Annotation/ViewsDisplay.php
+++ b/core/modules/views/src/Annotation/ViewsDisplay.php
@@ -111,7 +111,7 @@ class ViewsDisplay extends ViewsPluginAnnotationBase {
   /**
    * The theme function used to render the display's output.
    *
-   * @return string
+   * @var string
    */
   public $theme;
 
diff --git a/core/modules/views/src/Annotation/ViewsPager.php b/core/modules/views/src/Annotation/ViewsPager.php
index 84b6517913..6591d8bddb 100644
--- a/core/modules/views/src/Annotation/ViewsPager.php
+++ b/core/modules/views/src/Annotation/ViewsPager.php
@@ -50,7 +50,7 @@ class ViewsPager extends ViewsPluginAnnotationBase {
   /**
    * The theme function used to render the pager's output.
    *
-   * @return string
+   * @var string
    */
   public $theme;
 
diff --git a/core/modules/views/src/Annotation/ViewsRow.php b/core/modules/views/src/Annotation/ViewsRow.php
index 7e00e1ed17..c4d56622df 100644
--- a/core/modules/views/src/Annotation/ViewsRow.php
+++ b/core/modules/views/src/Annotation/ViewsRow.php
@@ -50,7 +50,7 @@ class ViewsRow extends ViewsPluginAnnotationBase {
   /**
    * The theme function used to render the row output.
    *
-   * @return string
+   * @var string
    */
   public $theme;
 
diff --git a/core/modules/views/src/Entity/View.php b/core/modules/views/src/Entity/View.php
index b69234c3bc..621146678e 100644
--- a/core/modules/views/src/Entity/View.php
+++ b/core/modules/views/src/Entity/View.php
@@ -56,6 +56,8 @@ class View extends ConfigEntityBase implements ViewEntityInterface {
 
   /**
    * The label of the view.
+   *
+   * @var string
    */
   protected $label;
 
diff --git a/core/modules/views/src/Plugin/views/cache/CachePluginBase.php b/core/modules/views/src/Plugin/views/cache/CachePluginBase.php
index dff5eed926..58e7325407 100644
--- a/core/modules/views/src/Plugin/views/cache/CachePluginBase.php
+++ b/core/modules/views/src/Plugin/views/cache/CachePluginBase.php
@@ -30,6 +30,8 @@
 
   /**
    * Contains all data that should be written/read from cache.
+   *
+   * @var array
    */
   public $storage = [];
 
diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
index 25f3c01cab..87ec39df76 100644
--- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
+++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
@@ -68,7 +68,14 @@
    */
   const RENDER_TEXT_PHASE_EMPTY = 2;
 
+  /**
+   * @var string
+   */
   public $field_alias = 'unknown';
+
+  /**
+   * @var array
+   */
   public $aliases = [];
 
   /**
diff --git a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
index 873ecb9f6c..dbc9c18e00 100644
--- a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
+++ b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
@@ -48,16 +48,22 @@
   /**
    * Contains the actual value of the field,either configured in the views ui
    * or entered in the exposed filters.
+   *
+   * @var mixed
    */
   public $value = NULL;
 
   /**
    * Contains the operator which is used on the query.
+   *
+   * @var string
    */
   public $operator = '=';
 
   /**
    * Contains the information of the selected item in a grouped filter.
+   *
+   * @var string|null
    */
   public $group_info = NULL;
 
diff --git a/core/modules/views/src/Plugin/views/query/Sql.php b/core/modules/views/src/Plugin/views/query/Sql.php
index 612b0fc64b..293acc11de 100644
--- a/core/modules/views/src/Plugin/views/query/Sql.php
+++ b/core/modules/views/src/Plugin/views/query/Sql.php
@@ -32,17 +32,23 @@ class Sql extends QueryPluginBase {
 
   /**
    * A list of tables in the order they should be added, keyed by alias.
+   *
+   * @var array
    */
   protected $tableQueue = [];
 
   /**
    * Holds an array of tables and counts added so that we can create aliases
+   *
+   * @var array
    */
   public $tables = [];
 
   /**
    * Holds an array of relationships, which are aliases of the primary
    * table that represent different ways to join the same table in.
+   *
+   * @var array
    */
   public $relationships = [];
 
@@ -50,55 +56,78 @@ class Sql extends QueryPluginBase {
    * An array of sections of the WHERE query. Each section is in itself
    * an array of pieces and a flag as to whether or not it should be AND
    * or OR.
+   *
+   * @var array
    */
   public $where = [];
   /**
    * An array of sections of the HAVING query. Each section is in itself
    * an array of pieces and a flag as to whether or not it should be AND
    * or OR.
+   *
+   * @var array
    */
   public $having = [];
   /**
    * The default operator to use when connecting the WHERE groups. May be
    * AND or OR.
+   *
+   * @var string
    */
   protected $groupOperator = 'AND';
 
   /**
    * A simple array of order by clauses.
+   *
+   * @var array
    */
   public $orderby = [];
 
   /**
    * A simple array of group by clauses.
+   *
+   * @var array
    */
   public $groupby = [];
 
 
   /**
    * An array of fields.
+   *
+   * @var array
    */
   public $fields = [];
 
   /**
    * A flag as to whether or not to make the primary field distinct.
+   *
+   * @var bool
    */
   public $distinct = FALSE;
 
+  /**
+   * @var bool
+   */
   protected $hasAggregate = FALSE;
 
   /**
    * Should this query be optimized for counts, for example no sorts.
+   *
+   * @var bool
    */
   protected $getCountOptimized = NULL;
 
   /**
    * An array mapping table aliases and field names to field aliases.
+   *
+   * @var array
    */
   protected $fieldAliases = [];
 
   /**
    * Query tags which will be passed over to the dbtng query object.
+   *
+   * @var array
    */
   public $tags = [];
 
diff --git a/core/modules/views/src/Plugin/views/style/StylePluginBase.php b/core/modules/views/src/Plugin/views/style/StylePluginBase.php
index 1d6b49179b..356707ba3b 100644
--- a/core/modules/views/src/Plugin/views/style/StylePluginBase.php
+++ b/core/modules/views/src/Plugin/views/style/StylePluginBase.php
@@ -46,6 +46,8 @@
 
   /**
    * Store all available tokens row rows.
+   *
+   * @var array
    */
   protected $rowTokens = [];
 
diff --git a/core/modules/views/src/ViewsDataHelper.php b/core/modules/views/src/ViewsDataHelper.php
index 32e6adae8f..bfda18cfd2 100644
--- a/core/modules/views/src/ViewsDataHelper.php
+++ b/core/modules/views/src/ViewsDataHelper.php
@@ -20,7 +20,7 @@ class ViewsDataHelper {
   /**
    * A prepared list of all fields, keyed by base_table and handler type.
    *
-   * @param array
+   * @var array
    */
   protected $fields;
 
diff --git a/core/modules/views/tests/src/Functional/Plugin/AccessTest.php b/core/modules/views/tests/src/Functional/Plugin/AccessTest.php
index 41aa6ec53a..31a64cc1cf 100644
--- a/core/modules/views/tests/src/Functional/Plugin/AccessTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/AccessTest.php
@@ -25,7 +25,7 @@ class AccessTest extends ViewTestBase {
   /**
    * Modules to enable.
    *
-   * @return array
+   * @var array
    */
   public static $modules = ['node'];
 
diff --git a/core/modules/views/tests/src/Unit/Plugin/field/CounterTest.php b/core/modules/views/tests/src/Unit/Plugin/field/CounterTest.php
index 4d67c00d8a..d997da295a 100644
--- a/core/modules/views/tests/src/Unit/Plugin/field/CounterTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/field/CounterTest.php
@@ -46,7 +46,7 @@ class CounterTest extends UnitTestCase {
   /**
    * The handler definition of the counter field.
    *
-   * @return array
+   * @var array
    */
   protected $definition;
 
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index d9b795d6dc..ad5f3f1eda 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -64,9 +64,8 @@
     <exclude name="Drupal.Commenting.FunctionComment.TypeHintMissing"/>
   </rule>
   <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Commenting/VariableCommentSniff.php">
-    <!-- Sniff for: DuplicateVar, EmptyVar, InlineVariableName -->
+    <!-- Sniff for: DuplicateVar, EmptyVar, InlineVariableName, MissingVar -->
     <exclude name="Drupal.Commenting.VariableComment.IncorrectVarType"/>
-    <exclude name="Drupal.Commenting.VariableComment.MissingVar"/>
     <exclude name="Drupal.Commenting.VariableComment.VarOrder"/>
     <exclude name="Drupal.Commenting.VariableComment.WrongStyle"/>
   </rule>
diff --git a/core/profiles/testing/modules/drupal_system_listing_compatible_test/src/Tests/SystemListingCompatibleTest.php b/core/profiles/testing/modules/drupal_system_listing_compatible_test/src/Tests/SystemListingCompatibleTest.php
index 7df92f2607..c7da09fe96 100644
--- a/core/profiles/testing/modules/drupal_system_listing_compatible_test/src/Tests/SystemListingCompatibleTest.php
+++ b/core/profiles/testing/modules/drupal_system_listing_compatible_test/src/Tests/SystemListingCompatibleTest.php
@@ -29,6 +29,8 @@ class SystemListingCompatibleTest extends WebTestBase {
    * asserts that this test is found.
    *
    * @see SimpleTestInstallationProfileModuleTestsTestCase
+   *
+   * @var string
    */
   protected $profile = 'minimal';
 
diff --git a/core/tests/Drupal/FunctionalTests/Update/UpdatePathTestBase.php b/core/tests/Drupal/FunctionalTests/Update/UpdatePathTestBase.php
index 4aca50032b..3a1668bb62 100644
--- a/core/tests/Drupal/FunctionalTests/Update/UpdatePathTestBase.php
+++ b/core/tests/Drupal/FunctionalTests/Update/UpdatePathTestBase.php
@@ -48,6 +48,8 @@
 
   /**
    * Modules to enable after the database is loaded.
+   *
+   * @var array
    */
   protected static $modules = [];
 
diff --git a/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php b/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php
index e239098715..578c7112d1 100644
--- a/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php
@@ -18,6 +18,8 @@ class SchemaTest extends KernelTestBase {
 
   /**
    * A global counter for table and field creation.
+   *
+   * @var int
    */
   protected $counter;
 
diff --git a/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php b/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php
index 0f231f482a..143ca9905e 100644
--- a/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php
@@ -35,6 +35,8 @@ class RouteProviderTest extends KernelTestBase {
 
   /**
    * Modules to enable.
+   *
+   * @var array
    */
   public static $modules = ['url_alter_test', 'system'];
 
diff --git a/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFastFileStorageTest.php b/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFastFileStorageTest.php
index 577241d472..e624ba13be 100644
--- a/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFastFileStorageTest.php
+++ b/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFastFileStorageTest.php
@@ -18,11 +18,13 @@ 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 array
    */
   protected $expected = [TRUE, FALSE];
 
   /**
-   * The PHP storage class to test.
+   * {@inheritdoc}
    */
   protected $storageClass = 'Drupal\Component\PhpStorage\MTimeProtectedFastFileStorage';
 
diff --git a/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php b/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php
index e787510088..1db10f2d69 100644
--- a/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php
+++ b/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php
@@ -14,6 +14,8 @@
    * The PHP storage class to test.
    *
    * This should be overridden by extending classes.
+   *
+   * @var string
    */
   protected $storageClass;
 
diff --git a/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageTest.php b/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageTest.php
index bc88c33459..f6a4d3566e 100644
--- a/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageTest.php
+++ b/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageTest.php
@@ -17,11 +17,13 @@ class MTimeProtectedFileStorageTest extends MTimeProtectedFileStorageBase {
    *
    * The default implementation protects against even the filemtime change so
    * both iterations will return FALSE.
+   *
+   * @var array
    */
   protected $expected = [FALSE, FALSE];
 
   /**
-   * The PHP storage class to test.
+   * {@inheritdoc}
    */
   protected $storageClass = 'Drupal\Component\PhpStorage\MTimeProtectedFileStorage';
 
diff --git a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
index c53b47405e..584baca69d 100644
--- a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
@@ -56,6 +56,8 @@ class LinkGeneratorTest extends UnitTestCase {
 
   /**
    * Contains the LinkGenerator default options.
+   *
+   * @var array
    */
   protected $defaultOptions = [
     'query' => [],
