diff --git a/core/lib/Drupal/Component/Utility/Html.php b/core/lib/Drupal/Component/Utility/Html.php
index 1706b0cde69da9e32934ab310874d7f436ae5a2b..8aae1909a38aabf62e4c67bcfc59fdbb16bf45cd 100644
--- a/core/lib/Drupal/Component/Utility/Html.php
+++ b/core/lib/Drupal/Component/Utility/Html.php
@@ -51,10 +51,10 @@ class Html {
* tag. That tag only makes sense in an HTML-served-as-HTML context, in
* which case relative URLs are guaranteed to work.
*
+ * @var string[]
+ *
* @see https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes
* @see https://stackoverflow.com/questions/2725156/complete-list-of-html-tag-attributes-which-have-a-url-value
- *
- * @var string[]
*/
protected static $uriAttributes = ['href', 'poster', 'src', 'cite', 'data', 'action', 'formaction', 'srcset', 'about'];
diff --git a/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php b/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php
index c9ba3e7bb1e47db2cebcb9469b3dc3aaac38cdaf..efd4235c25de5de9d7c9524678c454a71ab39f0d 100644
--- a/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php
+++ b/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php
@@ -41,9 +41,9 @@ class OpenDialogCommand implements CommandInterface, CommandWithAttachedAssetsIn
*
* Any jQuery UI option can be used.
*
- * @see http://api.jqueryui.com/dialog.
- *
* @var array
+ *
+ * @see http://api.jqueryui.com/dialog.
*/
protected $dialogOptions;
diff --git a/core/lib/Drupal/Core/Annotation/Action.php b/core/lib/Drupal/Core/Annotation/Action.php
index 3a5009cf59655d828430336702215d2ba85ecb84..45183892d12a5310f5841e8ab0d6e4d29996cd8f 100644
--- a/core/lib/Drupal/Core/Annotation/Action.php
+++ b/core/lib/Drupal/Core/Annotation/Action.php
@@ -29,9 +29,9 @@ class Action extends Plugin {
/**
* The human-readable name of the action plugin.
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $label;
@@ -40,18 +40,18 @@ class Action extends Plugin {
*
* This property is optional and it does not need to be declared.
*
- * @todo Provide a more generic way to allow an action to be confirmed first.
- *
* @var string
+ *
+ * @todo Provide a more generic way to allow an action to be confirmed first.
*/
public $confirm_form_route_name = '';
/**
* The entity type the action can apply to.
*
- * @todo Replace with \Drupal\Core\Plugin\Context\Context.
- *
* @var string
+ *
+ * @todo Replace with \Drupal\Core\Plugin\Context\Context.
*/
public $type = '';
diff --git a/core/lib/Drupal/Core/Archiver/Annotation/Archiver.php b/core/lib/Drupal/Core/Archiver/Annotation/Archiver.php
index 5f53b15f8d2e07be4a6637b2f226f64972041764..d360ba374ae782acacef5954f8814708ee3a9c1a 100644
--- a/core/lib/Drupal/Core/Archiver/Annotation/Archiver.php
+++ b/core/lib/Drupal/Core/Archiver/Annotation/Archiver.php
@@ -30,18 +30,18 @@ class Archiver extends Plugin {
/**
* The human-readable name of the archiver plugin.
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $title;
/**
* The description of the archiver plugin.
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $description;
diff --git a/core/lib/Drupal/Core/Cache/DatabaseBackend.php b/core/lib/Drupal/Core/Cache/DatabaseBackend.php
index 28da6cd7bf999bac0c793f5ef24f956d883df983..8b45010914fef5a96c04b1a1b7eacb34c23c5b6b 100644
--- a/core/lib/Drupal/Core/Cache/DatabaseBackend.php
+++ b/core/lib/Drupal/Core/Cache/DatabaseBackend.php
@@ -42,9 +42,9 @@ class DatabaseBackend implements CacheBackendInterface {
/**
* The maximum number of rows that this cache bin table is allowed to store.
*
- * @see ::MAXIMUM_NONE
- *
* @var int
+ *
+ * @see ::MAXIMUM_NONE
*/
protected $maxRows;
diff --git a/core/lib/Drupal/Core/Condition/Annotation/Condition.php b/core/lib/Drupal/Core/Condition/Annotation/Condition.php
index 20a03eefbab617d9d991fbb70035be7fbf87ee21..1847f3eb0bdeabae1af4be586dc364411f346365 100644
--- a/core/lib/Drupal/Core/Condition/Annotation/Condition.php
+++ b/core/lib/Drupal/Core/Condition/Annotation/Condition.php
@@ -35,9 +35,9 @@ class Condition extends Plugin {
/**
* The human-readable name of the condition.
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $label;
diff --git a/core/lib/Drupal/Core/Config/ImportStorageTransformer.php b/core/lib/Drupal/Core/Config/ImportStorageTransformer.php
index 13efb7507c772fe1e0da599eac81032de680e095..4237f7885786c6c364e26796e02ed0374e80880f 100644
--- a/core/lib/Drupal/Core/Config/ImportStorageTransformer.php
+++ b/core/lib/Drupal/Core/Config/ImportStorageTransformer.php
@@ -47,9 +47,9 @@ final class ImportStorageTransformer {
/**
* The persistent lock which the config importer uses across requests.
*
- * @see \Drupal\Core\Config\ConfigImporter::alreadyImporting()
- *
* @var \Drupal\Core\Lock\LockBackendInterface
+ *
+ * @see \Drupal\Core\Config\ConfigImporter::alreadyImporting()
*/
protected $persistentLock;
diff --git a/core/lib/Drupal/Core/Config/UnmetDependenciesException.php b/core/lib/Drupal/Core/Config/UnmetDependenciesException.php
index 8217aa5ade7dec58141100f2709e839320deae4f..a2a1fa5d38e6b5e10d8eb0048fd1bfa654fd4912 100644
--- a/core/lib/Drupal/Core/Config/UnmetDependenciesException.php
+++ b/core/lib/Drupal/Core/Config/UnmetDependenciesException.php
@@ -13,9 +13,9 @@ class UnmetDependenciesException extends ConfigException {
/**
* A list of configuration objects that have unmet dependencies.
*
+ * @var array
* The list is keyed by the config object name, and the value is an array of
* the missing dependencies:
- *
* @code
*
* self::configObjects = [
@@ -26,8 +26,6 @@ class UnmetDependenciesException extends ConfigException {
* ];
*
* @endcode
- *
- * @var array
*/
protected $configObjects = [];
diff --git a/core/lib/Drupal/Core/Database/Query/Merge.php b/core/lib/Drupal/Core/Database/Query/Merge.php
index ab388e2e41f754059c5f5b3eab8be0d2d946abd8..4d1a19e6cadf98315f93d8de631f40c0336124d3 100644
--- a/core/lib/Drupal/Core/Database/Query/Merge.php
+++ b/core/lib/Drupal/Core/Database/Query/Merge.php
@@ -103,6 +103,8 @@ class Merge extends Query implements ConditionInterface {
/**
* Array of fields to update to an expression in case of a duplicate record.
*
+ * @var array
+ *
* This variable is a nested array in the following format:
* @code
* <some field> => [
@@ -110,8 +112,6 @@ class Merge extends Query implements ConditionInterface {
* 'arguments' => <array of arguments for condition, or NULL for none>,
* ];
* @endcode
- *
- * @var array
*/
protected $expressionFields = [];
diff --git a/core/lib/Drupal/Core/Database/Query/Update.php b/core/lib/Drupal/Core/Database/Query/Update.php
index 67cfdbc337800d53c2f2de98b90a10cae16a67b6..2a2638e35a6ccf1834d94bdae2409f52307ea331 100644
--- a/core/lib/Drupal/Core/Database/Query/Update.php
+++ b/core/lib/Drupal/Core/Database/Query/Update.php
@@ -37,6 +37,8 @@ class Update extends Query implements ConditionInterface {
/**
* Array of fields to update to an expression in case of a duplicate record.
*
+ * @var array
+ *
* This variable is a nested array in the following format:
* @code
* <some field> => [
@@ -44,8 +46,6 @@ class Update extends Query implements ConditionInterface {
* 'arguments' => <array of arguments for condition, or NULL for none>,
* ];
* @endcode
- *
- * @var array
*/
protected $expressionFields = [];
diff --git a/core/lib/Drupal/Core/Database/Schema.php b/core/lib/Drupal/Core/Database/Schema.php
index 9c5aac0968115d749ed93e53cfa778c67747a8b7..ee8d1469eba2c686a5414a0ec60ae3d1ed344ab4 100644
--- a/core/lib/Drupal/Core/Database/Schema.php
+++ b/core/lib/Drupal/Core/Database/Schema.php
@@ -30,9 +30,9 @@ abstract class Schema implements PlaceholderInterface {
* by defining the defaultSchema variable only MySQL has to re-write the
* method.
*
- * @see DatabaseSchema::getPrefixInfo()
- *
* @var string
+ *
+ * @see DatabaseSchema::getPrefixInfo()
*/
protected $defaultSchema = 'public';
diff --git a/core/lib/Drupal/Core/Datetime/DrupalDateTime.php b/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
index 172331cf5f841aa40fb6f27a7cc03a5e56de0545..92735af1b1763860339f63cb37f676c75d3a8762 100644
--- a/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
+++ b/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
@@ -29,6 +29,7 @@ class DrupalDateTime extends DateTimePlus {
/**
* Formatted strings translation cache.
*
+ * @var array
* Translation cache represents an instance storage for formatted date
* strings. It contains a multidimensional array where:
* - first level keys - are drupal language codes;
@@ -53,8 +54,6 @@ class DrupalDateTime extends DateTimePlus {
* ],
* ]
* @endcode
- *
- * @var array
*/
protected $formatTranslationCache = [];
diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index 2a0d76fadc0c5f615a3400b9325b599ef46c167d..313de9e3d62373975db1ec83f550bdcccd1d6857 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -227,9 +227,9 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
/**
* List of instantiated service provider classes.
*
- * @see \Drupal\Core\DrupalKernel::$serviceProviderClasses
- *
* @var array
+ *
+ * @see \Drupal\Core\DrupalKernel::$serviceProviderClasses
*/
protected $serviceProviders;
diff --git a/core/lib/Drupal/Core/Entity/Annotation/EntityReferenceSelection.php b/core/lib/Drupal/Core/Entity/Annotation/EntityReferenceSelection.php
index 33f64d60ecfee3ad5d38fb72f8e680636d02bd26..2bec8da1a3293ed43924950858f05cc3e9e9c5c0 100644
--- a/core/lib/Drupal/Core/Entity/Annotation/EntityReferenceSelection.php
+++ b/core/lib/Drupal/Core/Entity/Annotation/EntityReferenceSelection.php
@@ -35,15 +35,16 @@ class EntityReferenceSelection extends Plugin {
/**
* The human-readable name of the selection plugin.
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $label;
/**
* The selection plugin group.
*
+ * @var string
* This property is used to allow selection plugins to target a specific
* entity type while also inheriting the code of an existing selection plugin.
* For example, if we want to override the NodeSelection from the 'default'
@@ -54,8 +55,6 @@ class EntityReferenceSelection extends Plugin {
* group = "default",
* weight = 5
* @endcode
- *
- * @var string
*/
public $group;
diff --git a/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
index 52c1b9bf81e6061b2e2cad3c1b4620a2980713f6..bb3d3aea83e799592e30297bb36c3e3f4e785ba1 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
@@ -31,11 +31,11 @@ abstract class ContentEntityBase extends EntityBase implements \IteratorAggregat
* are keyed by language code, whereas LanguageInterface::LANGCODE_DEFAULT
* is used for values in default language.
*
+ * @var array
+ *
* @todo Add methods for getting original fields and for determining
* changes.
* @todo Provide a better way for defining default values.
- *
- * @var array
*/
protected $values = [];
@@ -49,9 +49,9 @@ abstract class ContentEntityBase extends EntityBase implements \IteratorAggregat
/**
* Local cache for field definitions.
*
- * @see ContentEntityBase::getFieldDefinitions()
- *
* @var array
+ *
+ * @see ContentEntityBase::getFieldDefinitions()
*/
protected $fieldDefinitions;
diff --git a/core/lib/Drupal/Core/Entity/EntityStorageBase.php b/core/lib/Drupal/Core/Entity/EntityStorageBase.php
index a1171201414fe9ff0e67d2335a9f986a43e73611..6a13d270587c691dc7322ecd2948dd815dd1f955 100644
--- a/core/lib/Drupal/Core/Entity/EntityStorageBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityStorageBase.php
@@ -20,12 +20,12 @@ abstract class EntityStorageBase extends EntityHandlerBase implements EntityStor
/**
* Information about the entity type.
*
+ * @var \Drupal\Core\Entity\EntityTypeInterface
+ *
* The following code returns the same object:
* @code
* \Drupal::entityTypeManager()->getDefinition($this->entityTypeId)
* @endcode
- *
- * @var \Drupal\Core\Entity\EntityTypeInterface
*/
protected $entityType;
diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
index 5e5dfb815c82dc887ffbbb4da2f29b63243143a4..4a6ab4088fb2afeaff66c559c8e9805c00e6d722 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
@@ -28,9 +28,9 @@ class Tables implements TablesInterface {
* properties. Its keys are unique references to the tables, values are
* aliases.
*
- * @see \Drupal\Core\Entity\Query\Sql\Tables::ensureEntityTable().
- *
* @var array
+ *
+ * @see \Drupal\Core\Entity\Query\Sql\Tables::ensureEntityTable().
*/
protected $entityTables = [];
diff --git a/core/lib/Drupal/Core/Field/Annotation/FieldFormatter.php b/core/lib/Drupal/Core/Field/Annotation/FieldFormatter.php
index 5f499e9175d5aeaba15caf23a259f71cfea17c7d..a084b63ffc5e188fc06f642debd06f79303954bd 100644
--- a/core/lib/Drupal/Core/Field/Annotation/FieldFormatter.php
+++ b/core/lib/Drupal/Core/Field/Annotation/FieldFormatter.php
@@ -32,18 +32,18 @@ class FieldFormatter extends Plugin {
/**
* The human-readable name of the formatter type.
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $label;
/**
* A short description of the formatter type.
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $description;
diff --git a/core/lib/Drupal/Core/Field/Annotation/FieldType.php b/core/lib/Drupal/Core/Field/Annotation/FieldType.php
index b1687f924d8db34b0239663d539418bdb8ac1f8d..ae9bb5475385853687562187cf6afdf6117b2d03 100644
--- a/core/lib/Drupal/Core/Field/Annotation/FieldType.php
+++ b/core/lib/Drupal/Core/Field/Annotation/FieldType.php
@@ -33,27 +33,27 @@ class FieldType extends DataType {
/**
* The human-readable name of the field type.
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $label;
/**
* A short human readable description for the field type.
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $description;
/**
* The category under which the field type should be listed in the UI.
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $category = '';
diff --git a/core/lib/Drupal/Core/Field/Annotation/FieldWidget.php b/core/lib/Drupal/Core/Field/Annotation/FieldWidget.php
index ff7dffd7f2adf53b6cbfe07e7d9ec2377129fb48..aac637ca49cc5ec6400a4136dda73bf8866ba1ac 100644
--- a/core/lib/Drupal/Core/Field/Annotation/FieldWidget.php
+++ b/core/lib/Drupal/Core/Field/Annotation/FieldWidget.php
@@ -31,18 +31,18 @@ class FieldWidget extends Plugin {
/**
* The human-readable name of the widget type.
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $label;
/**
* A short description of the widget type.
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $description;
diff --git a/core/lib/Drupal/Core/Field/FieldConfigBase.php b/core/lib/Drupal/Core/Field/FieldConfigBase.php
index 3cfe2eaaedf0751d7c59f33d03cadf98810f2101..2a17596587469ddab1b8c8759f708eca49b96062 100644
--- a/core/lib/Drupal/Core/Field/FieldConfigBase.php
+++ b/core/lib/Drupal/Core/Field/FieldConfigBase.php
@@ -118,6 +118,7 @@ abstract class FieldConfigBase extends ConfigEntityBase implements FieldConfigIn
/**
* Default field value.
*
+ * @var array
* The default value is used when an entity is created, either:
* - through an entity creation form; the form elements for the field are
* prepopulated with the default value.
@@ -141,8 +142,6 @@ abstract class FieldConfigBase extends ConfigEntityBase implements FieldConfigIn
* ['value' => 2],
* ]
* @endcode
- *
- * @var array
*/
protected $default_value = [];
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php
index 687b5cd21fcf2ca3c0ca3be96ad6325949d3d222..dbe8ef7787474d82de472f6f7211c3c6605cdf6d 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php
@@ -59,9 +59,9 @@ class EntityReferenceEntityFormatter extends EntityReferenceFormatterBase {
* Each counter takes into account all the relevant information about the
* field and the referenced entity that is being rendered.
*
- * @see \Drupal\Core\Field\Plugin\Field\FieldFormatter\EntityReferenceEntityFormatter::viewElements()
- *
* @var array
+ *
+ * @see \Drupal\Core\Field\Plugin\Field\FieldFormatter\EntityReferenceEntityFormatter::viewElements()
*/
protected static $recursiveRenderDepth = [];
diff --git a/core/lib/Drupal/Core/Field/PluginSettingsBase.php b/core/lib/Drupal/Core/Field/PluginSettingsBase.php
index 528d7d507c141143a27d3af17f7fbc06babcb1ca..808c5ae615553bb6ab14476ec2fb29928ce31f8e 100644
--- a/core/lib/Drupal/Core/Field/PluginSettingsBase.php
+++ b/core/lib/Drupal/Core/Field/PluginSettingsBase.php
@@ -22,9 +22,9 @@ abstract class PluginSettingsBase extends PluginBase implements PluginSettingsIn
/**
* The plugin settings injected by third party modules.
*
- * @see hooks
- *
* @var array
+ *
+ * @see hooks
*/
protected $thirdPartySettings = [];
diff --git a/core/lib/Drupal/Core/Form/FormState.php b/core/lib/Drupal/Core/Form/FormState.php
index 7e639c355d94bb4f65fd166e91721666d738cdad..cd87d04617de3fb7aad714408c8de7ce7649d1d2 100644
--- a/core/lib/Drupal/Core/Form/FormState.php
+++ b/core/lib/Drupal/Core/Form/FormState.php
@@ -103,9 +103,9 @@ class FormState implements FormStateInterface {
*
* This property is uncacheable.
*
- * @see self::setRebuild()
- *
* @var bool
+ *
+ * @see self::setRebuild()
*/
protected $rebuild = FALSE;
@@ -118,9 +118,9 @@ class FormState implements FormStateInterface {
*
* This property is uncacheable.
*
- * @see self::setInvalidToken()
- *
* @var bool
+ *
+ * @see self::setInvalidToken()
*/
protected $invalidToken = FALSE;
@@ -149,11 +149,11 @@ class FormState implements FormStateInterface {
/**
* Used to redirect the form on submission.
*
- * @see self::getRedirect()
- *
* This property is uncacheable.
*
* @var \Drupal\Core\Url|\Symfony\Component\HttpFoundation\RedirectResponse|null
+ *
+ * @see self::getRedirect()
*/
protected $redirect;
diff --git a/core/lib/Drupal/Core/ImageToolkit/Annotation/ImageToolkit.php b/core/lib/Drupal/Core/ImageToolkit/Annotation/ImageToolkit.php
index 9d4acb3f9dc3d198d3ed83231477d31b16a88524..eafddc9dc194ab40c9c4f1726c4ac33d5c86d46f 100644
--- a/core/lib/Drupal/Core/ImageToolkit/Annotation/ImageToolkit.php
+++ b/core/lib/Drupal/Core/ImageToolkit/Annotation/ImageToolkit.php
@@ -37,9 +37,9 @@ class ImageToolkit extends Plugin {
*
* The string should be wrapped in @Translation().
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $title;
diff --git a/core/lib/Drupal/Core/ImageToolkit/Annotation/ImageToolkitOperation.php b/core/lib/Drupal/Core/ImageToolkit/Annotation/ImageToolkitOperation.php
index 73c7f3363de893d1db0a2946de248d28c6197c50..e6588b859d9730d47c8bf795b4131fcb9b443abf 100644
--- a/core/lib/Drupal/Core/ImageToolkit/Annotation/ImageToolkitOperation.php
+++ b/core/lib/Drupal/Core/ImageToolkit/Annotation/ImageToolkitOperation.php
@@ -65,9 +65,9 @@ class ImageToolkitOperation extends Plugin {
*
* The string should be wrapped in @Translation().
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $label;
@@ -76,9 +76,9 @@ class ImageToolkitOperation extends Plugin {
*
* The string should be wrapped in @Translation().
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $description;
diff --git a/core/lib/Drupal/Core/Layout/Attribute/Layout.php b/core/lib/Drupal/Core/Layout/Attribute/Layout.php
index 11bf8a206cf663aaddbd1dc938d36d86d57e01e5..27dcf822e7d662bc444d36275c71eabba8f9f5dc 100644
--- a/core/lib/Drupal/Core/Layout/Attribute/Layout.php
+++ b/core/lib/Drupal/Core/Layout/Attribute/Layout.php
@@ -26,9 +26,9 @@ class Layout extends Plugin {
/**
* Any additional properties and values.
*
- * @see \Drupal\Core\Layout\LayoutDefinition::$additional
- *
* @var array
+ *
+ * @see \Drupal\Core\Layout\LayoutDefinition::$additional
*/
public readonly array $additional;
diff --git a/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscovery.php b/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscovery.php
index 586655806016cf1124d6c1c1651cdbbfd698c43c..bde8f161616ee21373b1ddd60a2579741f6bf486 100644
--- a/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscovery.php
+++ b/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscovery.php
@@ -32,9 +32,9 @@ class YamlDiscovery implements DiscoveryInterface {
/**
* Contains an array of translatable properties passed along to t().
*
- * @see \Drupal\Core\Plugin\Discovery\YamlDiscovery::addTranslatableProperty()
- *
* @var array
+ *
+ * @see \Drupal\Core\Plugin\Discovery\YamlDiscovery::addTranslatableProperty()
*/
protected $translatableProperties = [];
diff --git a/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php b/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
index e8f8b5dfdc0090872db4fafb9e3cb58afe828a9a..b0cce3f255191bb4f76614c39ed2e311db79ef95 100644
--- a/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
+++ b/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
@@ -75,9 +75,9 @@ class HtmlRenderer implements MainContentRendererInterface {
/**
* The renderer configuration array.
*
- * @see sites/default/default.services.yml
- *
* @var array
+ *
+ * @see sites/default/default.services.yml
*/
protected $rendererConfig;
diff --git a/core/lib/Drupal/Core/Session/SessionManager.php b/core/lib/Drupal/Core/Session/SessionManager.php
index 8b43dfb21b04cf5d926c8b851c522877b38fbf64..1004b1f6621f5e5a67a577ee5f13ce999a67ddff 100644
--- a/core/lib/Drupal/Core/Session/SessionManager.php
+++ b/core/lib/Drupal/Core/Session/SessionManager.php
@@ -38,10 +38,10 @@ class SessionManager extends NativeSessionStorage implements SessionManagerInter
/**
* The write safe session handler.
*
+ * @var \Drupal\Core\Session\WriteSafeSessionHandlerInterface
+ *
* @todo This reference should be removed once all database queries
* are removed from the session manager class.
- *
- * @var \Drupal\Core\Session\WriteSafeSessionHandlerInterface
*/
protected $writeSafeHandler;
diff --git a/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php b/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php
index 5e0795239a81d652cb326001e794ebbf1fea910d..9501cbfcdd611552b76baf78b62207bf446e1476 100644
--- a/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php
+++ b/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php
@@ -63,9 +63,9 @@ trait FunctionalTestSetupTrait {
/**
* Set to TRUE to make user 1 a super user.
*
- * @see \Drupal\Core\Session\SuperUserAccessPolicy
- *
* @var bool
+ *
+ * @see \Drupal\Core\Session\SuperUserAccessPolicy
*/
protected bool $usesSuperUserAccessPolicy;
diff --git a/core/lib/Drupal/Core/Test/TestSetupTrait.php b/core/lib/Drupal/Core/Test/TestSetupTrait.php
index e3bb02f10bcd5533679b3436cd9bebd1b93db7a2..e68c9dba532b14b942d6f0b8a34b54d0830bff65 100644
--- a/core/lib/Drupal/Core/Test/TestSetupTrait.php
+++ b/core/lib/Drupal/Core/Test/TestSetupTrait.php
@@ -42,9 +42,9 @@ trait TestSetupTrait {
/**
* The public file directory for the test environment.
*
- * @see \Drupal\Tests\BrowserTestBase::prepareEnvironment()
- *
* @var string
+ *
+ * @see \Drupal\Tests\BrowserTestBase::prepareEnvironment()
*/
protected $publicFilesDirectory;
@@ -58,18 +58,18 @@ trait TestSetupTrait {
/**
* The private file directory for the test environment.
*
- * @see \Drupal\Tests\BrowserTestBase::prepareEnvironment()
- *
* @var string
+ *
+ * @see \Drupal\Tests\BrowserTestBase::prepareEnvironment()
*/
protected $privateFilesDirectory;
/**
* Set to TRUE to strict check all configuration saved.
*
- * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker
- *
* @var bool
+ *
+ * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker
*/
protected $strictConfigSchema = TRUE;
@@ -100,10 +100,10 @@ trait TestSetupTrait {
* This value has to match the temporary directory created in
* install_base_system() for test installs.
*
+ * @var string
+ *
* @see \Drupal\Tests\BrowserTestBase::prepareEnvironment()
* @see install_base_system()
- *
- * @var string
*/
protected $tempFilesDirectory;
diff --git a/core/lib/Drupal/Core/TypedData/Annotation/DataType.php b/core/lib/Drupal/Core/TypedData/Annotation/DataType.php
index a524a446f446b14e76d165dab01e4a4adc63c355..cb5dcc6c50fe1ffcad8a40cf79c020fb1f31a818 100644
--- a/core/lib/Drupal/Core/TypedData/Annotation/DataType.php
+++ b/core/lib/Drupal/Core/TypedData/Annotation/DataType.php
@@ -43,18 +43,18 @@ class DataType extends Plugin {
/**
* The human-readable name of the data type.
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $label;
/**
* The description of the data type.
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $description;
diff --git a/core/lib/Drupal/Core/Validation/Annotation/Constraint.php b/core/lib/Drupal/Core/Validation/Annotation/Constraint.php
index 61082902a218a657d0320f63fa432c45224d3c9e..5f248b0828234c7e7fcf22255e41a4c7580dd751 100644
--- a/core/lib/Drupal/Core/Validation/Annotation/Constraint.php
+++ b/core/lib/Drupal/Core/Validation/Annotation/Constraint.php
@@ -31,9 +31,9 @@ class Constraint extends Plugin {
/**
* The human-readable name of the constraint plugin.
*
- * @ingroup plugin_translatable
- *
* @var string|\Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $label;
diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EntityBundleExistsConstraint.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EntityBundleExistsConstraint.php
index 23feb01926d1973021cc0c8aded621a445fe3a10..61c2b443620a373a8ef97ea658fdcbc3d9730bc2 100644
--- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EntityBundleExistsConstraint.php
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EntityBundleExistsConstraint.php
@@ -33,9 +33,9 @@ class EntityBundleExistsConstraint extends SymfonyConstraint {
*
* This can contain variable values (e.g., `%parent`) that will be replaced.
*
- * @see \Drupal\Core\Config\Schema\TypeResolver::replaceVariable()
- *
* @var string
+ *
+ * @see \Drupal\Core\Config\Schema\TypeResolver::replaceVariable()
*/
public string $entityTypeId;
diff --git a/core/modules/big_pipe/src/Render/BigPipeResponse.php b/core/modules/big_pipe/src/Render/BigPipeResponse.php
index 0af6996170681ea613094cc6ababcaf20dc7dc40..f84105724e1bf3a24c7831d5b3afd374e425b7c3 100644
--- a/core/modules/big_pipe/src/Render/BigPipeResponse.php
+++ b/core/modules/big_pipe/src/Render/BigPipeResponse.php
@@ -34,10 +34,10 @@ class BigPipeResponse extends HtmlResponse implements ResponseKeepSessionOpenInt
* Still contains placeholders. Its cacheability metadata and attachments are
* for everything except the placeholders (since those are not yet rendered).
*
+ * @var \Drupal\Core\Render\HtmlResponse
+ *
* @see \Drupal\Core\Render\StreamedResponseInterface
* @see ::getStreamedResponse()
- *
- * @var \Drupal\Core\Render\HtmlResponse
*/
protected $originalHtmlResponse;
diff --git a/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditor5AllowedTagsTest.php b/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditor5AllowedTagsTest.php
index 22a369eca034120ebbae3a7a2e11ec843e0a6da2..ca9cb17ca62bc9bb80b6fa207d88822402fcb77c 100644
--- a/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditor5AllowedTagsTest.php
+++ b/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditor5AllowedTagsTest.php
@@ -41,9 +41,9 @@ class CKEditor5AllowedTagsTest extends CKEditor5TestBase {
/**
* The default allowed elements for filter_html's "allowed_html" setting.
*
- * @see \Drupal\filter\Plugin\Filter\FilterHtml
- *
* @var string
+ *
+ * @see \Drupal\filter\Plugin\Filter\FilterHtml
*/
protected $defaultElementsWhenUpdatingNotCkeditor5 = "<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type='1 A I'> <li> <dl> <dt> <dd> <h2 id='jump-*'> <h3 id> <h4 id> <h5 id> <h6 id>";
diff --git a/core/modules/ckeditor5/tests/src/Kernel/SmartDefaultSettingsTest.php b/core/modules/ckeditor5/tests/src/Kernel/SmartDefaultSettingsTest.php
index 353ebe95158b4d120f273d79b792a546e12b9b4b..0354fb2f86db2f8e6d3cc78b5c0e2ec693f5d84e 100644
--- a/core/modules/ckeditor5/tests/src/Kernel/SmartDefaultSettingsTest.php
+++ b/core/modules/ckeditor5/tests/src/Kernel/SmartDefaultSettingsTest.php
@@ -31,9 +31,9 @@ class SmartDefaultSettingsTest extends KernelTestBase {
*
* The updated Text Format & Text Editors are explicitly checked.
*
- * @see \Drupal\Core\Config\Development\ConfigSchemaChecker
- *
* @var bool
+ *
+ * @see \Drupal\Core\Config\Development\ConfigSchemaChecker
*/
protected $strictConfigSchema = FALSE;
diff --git a/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php b/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
index c6813dd7d6609af080071bcaacea9c63d65f35ff..8982dbb808efc81f4018a3c841a796f88f4a8548 100644
--- a/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
+++ b/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
@@ -30,9 +30,9 @@ class ConfigNamesMapperTest extends UnitTestCase {
/**
* The configuration names mapper to test.
*
- * @see \Drupal\config_translation\ConfigNamesMapper
- *
* @var \Drupal\Tests\config_translation\Unit\TestConfigNamesMapper
+ *
+ * @see \Drupal\config_translation\ConfigNamesMapper
*/
protected $configNamesMapper;
diff --git a/core/modules/editor/src/Annotation/Editor.php b/core/modules/editor/src/Annotation/Editor.php
index 9ae86d8fdc9f071385c4b7f6777f7725819d972a..d39d9cc1bf45191d429e864f504013ce2c7a97e4 100644
--- a/core/modules/editor/src/Annotation/Editor.php
+++ b/core/modules/editor/src/Annotation/Editor.php
@@ -62,9 +62,9 @@ class Editor extends Plugin {
/**
* The human-readable name of the editor plugin.
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $label;
diff --git a/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php b/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
index dc6f580fdc1cfafd5fb249ae6e5514815927387f..09dbffeaffaaefe364cc204a92b77e529b9e8d8d 100644
--- a/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
+++ b/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
@@ -40,9 +40,9 @@ abstract class FieldKernelTestBase extends KernelTestBase {
* - $this->fieldTestData->field[suffix]
* - $this->fieldTestData->field_definition[suffix]
*
- * @see \Drupal\field\Tests\FieldUnitTestBase::createFieldWithStorage()
- *
* @var \ArrayObject
+ *
+ * @see \Drupal\field\Tests\FieldUnitTestBase::createFieldWithStorage()
*/
protected $fieldTestData;
diff --git a/core/modules/file/tests/src/FunctionalJavascript/MaximumFileSizeExceededUploadTest.php b/core/modules/file/tests/src/FunctionalJavascript/MaximumFileSizeExceededUploadTest.php
index 57e01039ee3cbb3569111730dae0858eefe1b373..41bbae0b789ad2db282041e4f55e2750fd86e0a4 100644
--- a/core/modules/file/tests/src/FunctionalJavascript/MaximumFileSizeExceededUploadTest.php
+++ b/core/modules/file/tests/src/FunctionalJavascript/MaximumFileSizeExceededUploadTest.php
@@ -46,10 +46,10 @@ class MaximumFileSizeExceededUploadTest extends WebDriverTestBase {
/**
* The original value of the 'display_errors' PHP configuration option.
*
+ * @var string
+ *
* @todo Remove this when issue #2905597 is fixed.
* @see https://www.drupal.org/node/2905597
- *
- * @var string
*/
protected $originalDisplayErrorsValue;
diff --git a/core/modules/filter/src/Annotation/Filter.php b/core/modules/filter/src/Annotation/Filter.php
index 53d607bc2a92f23391978f65a4a8d59e2dde530d..5f4f596466c535237cb49539fcc96292a7acce80 100644
--- a/core/modules/filter/src/Annotation/Filter.php
+++ b/core/modules/filter/src/Annotation/Filter.php
@@ -39,9 +39,9 @@ class Filter extends Plugin {
*
* This is used as an administrative summary of what the filter does.
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $title;
@@ -50,9 +50,9 @@ class Filter extends Plugin {
*
* This property is optional and it does not need to be declared.
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $description = '';
diff --git a/core/modules/filter/src/Entity/FilterFormat.php b/core/modules/filter/src/Entity/FilterFormat.php
index dab96a0e9e126002346f234b2aa19df23c0f56d1..e8710b60288284fc31b5acf588952f1d2bdfcf6c 100644
--- a/core/modules/filter/src/Entity/FilterFormat.php
+++ b/core/modules/filter/src/Entity/FilterFormat.php
@@ -64,9 +64,9 @@ class FilterFormat extends ConfigEntityBase implements FilterFormatInterface, En
/**
* Unique machine name of the format.
*
- * @todo Rename to $id.
- *
* @var string
+ *
+ * @todo Rename to $id.
*/
protected $format;
@@ -77,9 +77,9 @@ class FilterFormat extends ConfigEntityBase implements FilterFormatInterface, En
* label but different filter configuration would impose a security risk.
* Therefore, each text format label must be unique.
*
- * @todo Rename to $label.
- *
* @var string
+ *
+ * @todo Rename to $label.
*/
protected $name;
diff --git a/core/modules/filter/src/FilterProcessResult.php b/core/modules/filter/src/FilterProcessResult.php
index 32dd95e29ac01f03c69e431bd8e761298d506305..2de4f46dad1c20befc2fc42c4f0bccf3a05c5e22 100644
--- a/core/modules/filter/src/FilterProcessResult.php
+++ b/core/modules/filter/src/FilterProcessResult.php
@@ -66,9 +66,9 @@ class FilterProcessResult extends BubbleableMetadata {
/**
* The processed text.
*
- * @see \Drupal\filter\Plugin\FilterInterface::process()
- *
* @var string
+ *
+ * @see \Drupal\filter\Plugin\FilterInterface::process()
*/
protected $processedText;
diff --git a/core/modules/image/src/Annotation/ImageEffect.php b/core/modules/image/src/Annotation/ImageEffect.php
index f45977013c6d9be8222d18b6bbcc83d2603e8ad2..f997a8d43e6113c4acb35f887683195909d38f7d 100644
--- a/core/modules/image/src/Annotation/ImageEffect.php
+++ b/core/modules/image/src/Annotation/ImageEffect.php
@@ -35,9 +35,9 @@ class ImageEffect extends Plugin {
/**
* The human-readable name of the image effect.
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $label;
@@ -48,9 +48,9 @@ class ImageEffect extends Plugin {
*
* This will be shown when adding or configuring this image effect.
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $description = '';
diff --git a/core/modules/language/src/Annotation/LanguageNegotiation.php b/core/modules/language/src/Annotation/LanguageNegotiation.php
index 2d95a055b5e1e92203fce1cca65605904d19f880..84178efdef88980c8c09b5161b5a0d43aa46f167 100644
--- a/core/modules/language/src/Annotation/LanguageNegotiation.php
+++ b/core/modules/language/src/Annotation/LanguageNegotiation.php
@@ -52,18 +52,18 @@ class LanguageNegotiation extends Plugin {
/**
* The human-readable name of the language negotiation plugin.
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $name;
/**
* The description of the language negotiation plugin.
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $description;
diff --git a/core/modules/language/src/Entity/ConfigurableLanguage.php b/core/modules/language/src/Entity/ConfigurableLanguage.php
index a8235aa4fe2eddd7b5a8aaeaeba16114fa95bbd6..6a5681079b9e711784af7881cd4884b54ef9f998 100644
--- a/core/modules/language/src/Entity/ConfigurableLanguage.php
+++ b/core/modules/language/src/Entity/ConfigurableLanguage.php
@@ -98,10 +98,10 @@ class ConfigurableLanguage extends ConfigEntityBase implements ConfigurableLangu
* This property is not saved to the language entity, but is needed for
* detecting when to rebuild the services.
*
+ * @var bool
+ *
* @see \Drupal\language\Entity\ConfigurableLanguage::preSave()
* @see \Drupal\language\Entity\ConfigurableLanguage::postSave()
- *
- * @var bool
*/
protected $preSaveMultilingual;
diff --git a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
index 243e3354e106a33b6d9e591232338d21d05f6b58..2acbda5514322a764ea6f9b73568b2feac8196ab 100644
--- a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
+++ b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
@@ -50,9 +50,9 @@ class LanguageNegotiationContentEntity extends LanguageNegotiationMethodBase imp
/**
* Static cache for the language negotiation order check.
*
- * @see \Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationContentEntity::hasLowerLanguageNegotiationWeight()
- *
* @var bool
+ *
+ * @see \Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationContentEntity::hasLowerLanguageNegotiationWeight()
*/
protected $hasLowerLanguageNegotiationWeightResult;
diff --git a/core/modules/locale/src/LocaleConfigManager.php b/core/modules/locale/src/LocaleConfigManager.php
index 374bae750fdb89c24de5362b1fbd070ff28fec10..2bfc8ea42114942a15709c738e5d54783bb482c2 100644
--- a/core/modules/locale/src/LocaleConfigManager.php
+++ b/core/modules/locale/src/LocaleConfigManager.php
@@ -78,9 +78,9 @@ class LocaleConfigManager {
/**
* Whether or not configuration translations are being updated from locale.
*
- * @see self::isUpdatingFromLocale()
- *
* @var bool
+ *
+ * @see self::isUpdatingFromLocale()
*/
protected $isUpdatingFromLocale = FALSE;
diff --git a/core/modules/locale/src/PluralFormula.php b/core/modules/locale/src/PluralFormula.php
index b93658f9321ff2226b8a91ba7dfbcd5d0e472e3d..1cff1f4c78dbf4d465ed769ad91179e18d7ce9c1 100644
--- a/core/modules/locale/src/PluralFormula.php
+++ b/core/modules/locale/src/PluralFormula.php
@@ -25,6 +25,8 @@ class PluralFormula implements PluralFormulaInterface {
/**
* The plural formula and count keyed by langcode.
*
+ * @var array
+ *
* For example the structure looks like this:
* @code
* [
@@ -36,7 +38,6 @@ class PluralFormula implements PluralFormulaInterface {
* ],
* ]
* @endcode
- * @var array
*/
protected $formulae;
diff --git a/core/modules/migrate/src/Annotation/MigrateSource.php b/core/modules/migrate/src/Annotation/MigrateSource.php
index 8445ca014a576b13bcc5f6e423b566f7653a9552..2a4a32fc2fc2b5dde803649e9e1d43407dbfd267 100644
--- a/core/modules/migrate/src/Annotation/MigrateSource.php
+++ b/core/modules/migrate/src/Annotation/MigrateSource.php
@@ -47,9 +47,9 @@ class MigrateSource extends Plugin implements MultipleProviderAnnotationInterfac
* Migrate Drupal's source plugins expect source_module to be the name of a
* module that must be installed and enabled in the source database.
*
- * @see \Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase::checkRequirements
- *
* @var string
+ *
+ * @see \Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase::checkRequirements
*/
public $source_module;
diff --git a/core/modules/migrate/src/MigrateExecutable.php b/core/modules/migrate/src/MigrateExecutable.php
index 0a3c13928e00089f5354ca6c57bf86e3c96de077..54a0004ef920d69beff8f68e4e0a38f3776fa9d3 100644
--- a/core/modules/migrate/src/MigrateExecutable.php
+++ b/core/modules/migrate/src/MigrateExecutable.php
@@ -85,9 +85,9 @@ class MigrateExecutable implements MigrateExecutableInterface {
/**
* Migration message service.
*
- * @todo https://www.drupal.org/node/2822663 Make this protected.
- *
* @var \Drupal\migrate\MigrateMessageInterface
+ *
+ * @todo https://www.drupal.org/node/2822663 Make this protected.
*/
public $message;
diff --git a/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php b/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php
index e7a706783d3b8f3780132db42c298547dc2687b2..18e1bdeeb35b71d412d91a7301c13abbe4eec9bb 100644
--- a/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php
+++ b/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php
@@ -46,9 +46,9 @@ class MigrateUpgradeImportBatch {
/**
* The maximum length in seconds to allow processing in a request.
*
- * @see self::run()
- *
* @var int
+ *
+ * @see self::run()
*/
protected static $maxExecTime;
diff --git a/core/modules/pgsql/src/Driver/Database/pgsql/Connection.php b/core/modules/pgsql/src/Driver/Database/pgsql/Connection.php
index aad885b410973430627a5f18e1bd4d19495272b2..e9c67c3b915d2564a6714e473f42ca63314ba0f2 100644
--- a/core/modules/pgsql/src/Driver/Database/pgsql/Connection.php
+++ b/core/modules/pgsql/src/Driver/Database/pgsql/Connection.php
@@ -78,11 +78,11 @@ class Connection extends DatabaseConnection implements SupportsTemporaryTablesIn
* savepoints opened to to mimic MySql's InnoDB functionality, which provides
* an inherent savepoint before any query in a transaction.
*
+ * @var array<string,Transaction>
+ *
* @see ::addSavepoint()
* @see ::releaseSavepoint()
* @see ::rollbackSavepoint()
- *
- * @var array<string,Transaction>
*/
protected array $savepoints = [];
diff --git a/core/modules/pgsql/src/Driver/Database/pgsql/Schema.php b/core/modules/pgsql/src/Driver/Database/pgsql/Schema.php
index 04f13e3681898c37858a357561ba691123000c22..32a12b44ec17cf7418071dec416765d79c57f420 100644
--- a/core/modules/pgsql/src/Driver/Database/pgsql/Schema.php
+++ b/core/modules/pgsql/src/Driver/Database/pgsql/Schema.php
@@ -28,8 +28,9 @@ class Schema extends DatabaseSchema {
* This is collected by Schema::queryTableInformation(), by introspecting the
* database.
*
- * @see \Drupal\pgsql\Driver\Database\pgsql\Schema::queryTableInformation()
* @var array
+ *
+ * @see \Drupal\pgsql\Driver\Database\pgsql\Schema::queryTableInformation()
*/
protected $tableInformation = [];
diff --git a/core/modules/rest/src/Annotation/RestResource.php b/core/modules/rest/src/Annotation/RestResource.php
index 358d6d4216bc79c518fed984434736a929649a50..cc3682609e8f9f53353f136fc350d5a06d3f4853 100644
--- a/core/modules/rest/src/Annotation/RestResource.php
+++ b/core/modules/rest/src/Annotation/RestResource.php
@@ -32,9 +32,9 @@ class RestResource extends Plugin {
/**
* The human-readable name of the REST resource plugin.
*
- * @ingroup plugin_translatable
- *
* @var \Drupal\Core\Annotation\Translation
+ *
+ * @ingroup plugin_translatable
*/
public $label;
@@ -43,9 +43,9 @@ class RestResource extends Plugin {
*
* This property is optional and it does not need to be declared.
*
- * @see \Symfony\Component\Serializer\SerializerInterface's "type" parameter.
- *
* @var string
+ *
+ * @see \Symfony\Component\Serializer\SerializerInterface's "type" parameter.
*/
public $serialization_class;
@@ -55,9 +55,9 @@ class RestResource extends Plugin {
* Key-value pairs, with link relation type plugin IDs as keys, and URL
* templates as values.
*
- * @see core/core.link_relation_types.yml
- *
* @var string[]
+ *
+ * @see core/core.link_relation_types.yml
*/
public $uri_paths = [];
diff --git a/core/modules/rest/tests/src/Functional/CookieResourceTestTrait.php b/core/modules/rest/tests/src/Functional/CookieResourceTestTrait.php
index d96adf0df5bd7e993669b975b54e74881b7d6a84..b296446affbd030bad67b2bd304634b6a90140ee 100644
--- a/core/modules/rest/tests/src/Functional/CookieResourceTestTrait.php
+++ b/core/modules/rest/tests/src/Functional/CookieResourceTestTrait.php
@@ -27,27 +27,27 @@ trait CookieResourceTestTrait {
/**
* The session cookie.
*
- * @see ::initAuthentication
- *
* @var string
+ *
+ * @see ::initAuthentication
*/
protected $sessionCookie;
/**
* The CSRF token.
*
- * @see ::initAuthentication
- *
* @var string
+ *
+ * @see ::initAuthentication
*/
protected $csrfToken;
/**
* The logout token.
*
- * @see ::initAuthentication
- *
* @var string
+ *
+ * @see ::initAuthentication
*/
protected $logoutToken;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
index b7c3cc936f7a7ba4a9ca028f4bf8f139c76593e2..95549a46121a877ca1ae12dee1698450f8ce49bb 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
@@ -103,9 +103,9 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
*
* Some entities do not specify a 'label' entity key. For example: User.
*
- * @see ::getInvalidNormalizedEntityToCreate
- *
* @var string|null
+ *
+ * @see ::getInvalidNormalizedEntityToCreate
*/
protected static $labelFieldName = NULL;
@@ -114,9 +114,9 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
*
* The default value of 2 should work for most content entities.
*
- * @see ::testPost()
- *
* @var string|int
+ *
+ * @see ::testPost()
*/
protected static $firstCreatedEntityId = 2;
@@ -125,9 +125,9 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
*
* The default value of 3 should work for most content entities.
*
- * @see ::testPost()
- *
* @var string|int
+ *
+ * @see ::testPost()
*/
protected static $secondCreatedEntityId = 3;
diff --git a/core/modules/rest/tests/src/Functional/ResourceTestBase.php b/core/modules/rest/tests/src/Functional/ResourceTestBase.php
index 96fc9072d71929a0cb6c0348ef0ad80027c7c017..b63e75a2dc9ca79a5da4cfd81df55a8f0e83aa3d 100644
--- a/core/modules/rest/tests/src/Functional/ResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/ResourceTestBase.php
@@ -32,11 +32,11 @@ abstract class ResourceTestBase extends BrowserTestBase {
* A format is the combination of a certain normalizer and a certain
* serializer.
*
- * @see https://www.drupal.org/developing/api/8/serialization
- *
* (The default is 'json' because that doesn't depend on any module.)
*
* @var string
+ *
+ * @see https://www.drupal.org/developing/api/8/serialization
*/
protected static $format = 'json';
diff --git a/core/modules/search/src/Annotation/SearchPlugin.php b/core/modules/search/src/Annotation/SearchPlugin.php
index 7be1a1da042ace7e0c28410cb562c9275f9411df..2e100a4fde4ffb83db385c374923702702da4dc1 100644
--- a/core/modules/search/src/Annotation/SearchPlugin.php
+++ b/core/modules/search/src/Annotation/SearchPlugin.php
@@ -28,12 +28,12 @@ class SearchPlugin extends Plugin {
/**
* The title for the search page tab.
*
+ * @var \Drupal\Core\Annotation\Translation
+ *
* @todo This will potentially be translated twice or cached with the wrong
* translation until the search tabs are converted to local task plugins.
*
* @ingroup plugin_translatable
- *
- * @var \Drupal\Core\Annotation\Translation
*/
public $title;
diff --git a/core/modules/system/tests/src/Functional/Database/FakeRecord.php b/core/modules/system/tests/src/Functional/Database/FakeRecord.php
index 12912e7f6fa964b6dd1ca99504214b34f79a1bc8..f5dca0a2f62a575e8d823fca06a0851183e35876 100644
--- a/core/modules/system/tests/src/Functional/Database/FakeRecord.php
+++ b/core/modules/system/tests/src/Functional/Database/FakeRecord.php
@@ -23,18 +23,18 @@ class FakeRecord {
/**
* The property used in tests.
*
- * @see \Drupal\KernelTests\Core\Database\FetchTest
- *
* @var string
+ *
+ * @see \Drupal\KernelTests\Core\Database\FetchTest
*/
public string $name;
/**
* The property used in tests.
*
- * @see \Drupal\KernelTests\Core\Database\DatabaseTestBase
- *
* @var string
+ *
+ * @see \Drupal\KernelTests\Core\Database\DatabaseTestBase
*/
public string $job;
diff --git a/core/modules/views/src/Annotation/ViewsDisplay.php b/core/modules/views/src/Annotation/ViewsDisplay.php
index 238dfa7eff299bb27c3095fa0991480fc83fed32..ec170f521abaaf412802de46b0123ea91f96b64d 100644
--- a/core/modules/views/src/Annotation/ViewsDisplay.php
+++ b/core/modules/views/src/Annotation/ViewsDisplay.php
@@ -95,8 +95,6 @@ class ViewsDisplay extends ViewsPluginAnnotationBase {
* displays of a view. If this is not set or regions have been specified,
* views will display an option to 'hide contextual links'. Use an empty
* array to disable.
- *
- * @var array
*/
public $contextual_links_locations;
diff --git a/core/modules/views/src/ManyToOneHelper.php b/core/modules/views/src/ManyToOneHelper.php
index b082a1d8ea01c253201638b2596c41f554474143..b1583b2a9f00500f6ae1cd1e2884843d5640c488 100644
--- a/core/modules/views/src/ManyToOneHelper.php
+++ b/core/modules/views/src/ManyToOneHelper.php
@@ -24,9 +24,9 @@ class ManyToOneHelper {
/**
* Should the field use formula or alias.
*
- * @see \Drupal\views\Plugin\views\argument\StringArgument::query()
- *
* @var bool
+ *
+ * @see \Drupal\views\Plugin\views\argument\StringArgument::query()
*/
public bool $formula = FALSE;
diff --git a/core/modules/views/src/Plugin/views/PluginBase.php b/core/modules/views/src/Plugin/views/PluginBase.php
index 57c858928174357c7ec03d8bb9db5e34d421e4fc..0863bca03d27c2168010f1b247712d300f6531fd 100644
--- a/core/modules/views/src/Plugin/views/PluginBase.php
+++ b/core/modules/views/src/Plugin/views/PluginBase.php
@@ -79,9 +79,9 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
*
* For display plugins this is empty.
*
- * @todo find a better description
- *
* @var \Drupal\views\Plugin\views\display\DisplayPluginBase
+ *
+ * @todo find a better description
*/
public $displayHandler;
diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
index 8de85ffda91edddadbfbb2286a4a6ff9b14e712d..95511c21561478b05c60891dc723311e6e68e7ba 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
@@ -117,11 +117,11 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
/**
* The display information coming directly from the view entity.
*
+ * @var array
+ *
* @see \Drupal\views\Entity\View::getDisplay()
*
* @todo \Drupal\views\Entity\View::duplicateDisplayAsType directly access it.
- *
- * @var array
*/
public $display;
diff --git a/core/modules/views/src/Plugin/views/join/JoinPluginBase.php b/core/modules/views/src/Plugin/views/join/JoinPluginBase.php
index 795671963da74c9a8351c5e2ec0afcc61f2f6920..f2b61f306c09eff445844413304b5a5d7622632d 100644
--- a/core/modules/views/src/Plugin/views/join/JoinPluginBase.php
+++ b/core/modules/views/src/Plugin/views/join/JoinPluginBase.php
@@ -203,9 +203,9 @@ class JoinPluginBase extends PluginBase implements JoinPluginInterface {
* - value: Must be set. If an array, operator will be defaulted to IN.
* - numeric: If true, the value will not be surrounded in quotes.
*
- * @see SelectQueryInterface::addJoin()
- *
* @var array
+ *
+ * @see SelectQueryInterface::addJoin()
*/
public $extra;
diff --git a/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php
index f37ec50fb3c5b79022e37577d8e9ece18a6ff095..16c0821e2159812cf1c76abc0c46a5f679e0a2ad 100644
--- a/core/modules/views/src/ViewExecutable.php
+++ b/core/modules/views/src/ViewExecutable.php
@@ -40,18 +40,18 @@ class ViewExecutable {
/**
* Whether or not the view has been built.
*
- * @todo Group with other static properties.
- *
* @var bool
+ *
+ * @todo Group with other static properties.
*/
public $built = FALSE;
/**
* Whether the view has been executed/query has been run.
*
- * @todo Group with other static properties.
- *
* @var bool
+ *
+ * @todo Group with other static properties.
*/
public $executed = FALSE;
@@ -372,9 +372,9 @@ class ViewExecutable {
/**
* Does this view already have loaded its handlers.
*
- * @todo Group with other static properties.
- *
* @var bool
+ *
+ * @todo Group with other static properties.
*/
public $inited;
diff --git a/core/modules/workflows/src/Annotation/WorkflowType.php b/core/modules/workflows/src/Annotation/WorkflowType.php
index 97330c90c1ebc230f2932aee011624e24e2e2f31..808b3042ce77e2bbce5d03ff7dd4a2ef8483d6a3 100644
--- a/core/modules/workflows/src/Annotation/WorkflowType.php
+++ b/core/modules/workflows/src/Annotation/WorkflowType.php
@@ -53,6 +53,8 @@ class WorkflowType extends Plugin {
* - 'state' (\Drupal\workflows\StateInterface::PLUGIN_FORM_KEY)
* - 'transition' (\Drupal\workflows\TransitionInterface::PLUGIN_FORM_KEY)
*
+ * @var array
+ *
* @see \Drupal\Core\Plugin\PluginWithFormsInterface
* @see \Drupal\Core\Plugin\PluginFormInterface
* @see \Drupal\workflows\Plugin\WorkflowTypeConfigureFormBase
@@ -61,8 +63,6 @@ class WorkflowType extends Plugin {
* @see \Drupal\workflows\WorkflowTypeInterface::PLUGIN_FORM_KEY
* @see \Drupal\workflows\StateInterface::PLUGIN_FORM_KEY
* @see \Drupal\workflows\TransitionInterface::PLUGIN_FORM_KEY
- *
- * @var array
*/
public $forms = [];
diff --git a/core/modules/workflows/src/Entity/Workflow.php b/core/modules/workflows/src/Entity/Workflow.php
index 3c7b06bcc98b32619f33106abb7f34906a144141..bb10c0271aac7926b22a4d0f6ba5819e595efe7b 100644
--- a/core/modules/workflows/src/Entity/Workflow.php
+++ b/core/modules/workflows/src/Entity/Workflow.php
@@ -82,9 +82,9 @@ class Workflow extends ConfigEntityBase implements WorkflowInterface, EntityWith
/**
* The workflow type plugin ID.
*
- * @see \Drupal\workflows\WorkflowTypeManager
- *
* @var string
+ *
+ * @see \Drupal\workflows\WorkflowTypeManager
*/
protected $type;
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 149ccb56df2605046e73864788935bc2e6f4d5a3..a7486e8104fcd44bcd6262b4ce0121f46676ea3f 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -89,7 +89,6 @@
<!-- Sniff for: DuplicateVar, EmptyVar, IncorrectVarType, InlineVariableName, WrongStyle -->
<exclude name="Drupal.Commenting.VariableComment.Missing"/>
<exclude name="Drupal.Commenting.VariableComment.MissingVar"/>
- <exclude name="Drupal.Commenting.VariableComment.VarOrder"/>
</rule>
<rule ref="Drupal.ControlStructures.ControlSignature"/>
<rule ref="Drupal.ControlStructures.ElseIf"/>
diff --git a/core/tests/Drupal/FunctionalTests/Installer/InstallerTestBase.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerTestBase.php
index a527f3ab234fe054f466788b35b1164a7fa0c1bf..c1694932a0f82da3f53b977597637bcc0c43fed7 100644
--- a/core/tests/Drupal/FunctionalTests/Installer/InstallerTestBase.php
+++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerTestBase.php
@@ -55,9 +55,9 @@ abstract class InstallerTestBase extends BrowserTestBase {
/**
* Additional parameters to use for installer screens.
*
- * @see FunctionalTestSetupTrait::installParameters()
- *
* @var array
+ *
+ * @see FunctionalTestSetupTrait::installParameters()
*/
protected $parameters = [];
diff --git a/core/tests/Drupal/KernelTests/ConfigFormTestBase.php b/core/tests/Drupal/KernelTests/ConfigFormTestBase.php
index b588372865b8478368973e9a2ee68d38f70ad797..aa3bda340b15341946ea95574142a41c443d8fda 100644
--- a/core/tests/Drupal/KernelTests/ConfigFormTestBase.php
+++ b/core/tests/Drupal/KernelTests/ConfigFormTestBase.php
@@ -23,6 +23,7 @@ abstract class ConfigFormTestBase extends KernelTestBase {
/**
* Values to use for testing.
*
+ * @var array
* Contains details for form key, configuration object name, and config key.
* Example:
* @code
@@ -34,8 +35,6 @@ abstract class ConfigFormTestBase extends KernelTestBase {
* ],
* ];
* @endcode
- *
- * @var array
*/
protected $values;
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php
index dc7b5f49fdbc9ccb3619b0b41bd5dea342810876..3dd37bfba1cf8422f9a2b9764e97485fa0a91412 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php
@@ -22,9 +22,9 @@ class ConfigCRUDTest extends KernelTestBase {
/**
* Exempt from strict schema checking.
*
- * @see \Drupal\Core\Config\Development\ConfigSchemaChecker
- *
* @var bool
+ *
+ * @see \Drupal\Core\Config\Development\ConfigSchemaChecker
*/
protected $strictConfigSchema = FALSE;
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityUnitTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityUnitTest.php
index 2195b56e5b83d431868a4a8cb28de17ad9f5ef26..1966cffe265c25da94d927a877db93d2452f4d88 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityUnitTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityUnitTest.php
@@ -16,9 +16,9 @@ class ConfigEntityUnitTest extends KernelTestBase {
/**
* Exempt from strict schema checking.
*
- * @see \Drupal\Core\Config\Development\ConfigSchemaChecker
- *
* @var bool
+ *
+ * @see \Drupal\Core\Config\Development\ConfigSchemaChecker
*/
protected $strictConfigSchema = FALSE;
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityValidationTestBase.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityValidationTestBase.php
index d58fbf6e9a0685e202efa7861153ddae2287b8a4..c113df70dde62bf89dbf68dd7de9e98b4a1f437a 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityValidationTestBase.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityValidationTestBase.php
@@ -48,9 +48,9 @@ abstract class ConfigEntityValidationTestBase extends KernelTestBase {
* strong UI presence. For example: REST resource configuration entities and
* entity view displays.
*
- * @see \Drupal\Core\Entity\EntityInterface::label()
- *
* @var bool
+ *
+ * @see \Drupal\Core\Entity\EntityInterface::label()
*/
protected bool $hasLabel = TRUE;
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigFileContentTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigFileContentTest.php
index 6de861d79459dbdc688852a95d3b108dc7fb7201..a9add1db8c1ff68c64d5b7de96c1e63e9089a3c1 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigFileContentTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigFileContentTest.php
@@ -18,9 +18,9 @@ class ConfigFileContentTest extends KernelTestBase {
/**
* Exempt from strict schema checking.
*
- * @see \Drupal\Core\Config\Development\ConfigSchemaChecker
- *
* @var bool
+ *
+ * @see \Drupal\Core\Config\Development\ConfigSchemaChecker
*/
protected $strictConfigSchema = FALSE;
diff --git a/core/tests/Drupal/KernelTests/Core/Field/FieldMissingTypeTest.php b/core/tests/Drupal/KernelTests/Core/Field/FieldMissingTypeTest.php
index 3fedd71caf27ae7664b8791a04b186d1a9f9eb4c..46bbff7da7c4fbf48d0d8047cc3f1d27c07c65ac 100644
--- a/core/tests/Drupal/KernelTests/Core/Field/FieldMissingTypeTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Field/FieldMissingTypeTest.php
@@ -20,9 +20,9 @@ class FieldMissingTypeTest extends EntityKernelTestBase {
/**
* Set to FALSE because we are hacking a field storage to use a fake type.
*
- * @see \Drupal\Core\Config\Development\ConfigSchemaChecker
- *
* @var bool
+ *
+ * @see \Drupal\Core\Config\Development\ConfigSchemaChecker
*/
protected $strictConfigSchema = FALSE;
diff --git a/core/tests/Drupal/KernelTests/KernelTestBase.php b/core/tests/Drupal/KernelTests/KernelTestBase.php
index 9fd59bf8072ef477fad89e6c35555bebe09e887a..9935133b9200e3e4915eaa31d65b2aee5c84daa9 100644
--- a/core/tests/Drupal/KernelTests/KernelTestBase.php
+++ b/core/tests/Drupal/KernelTests/KernelTestBase.php
@@ -160,10 +160,10 @@ public function __construct(string $name) {
* it extends, and so on up the class hierarchy. It is not necessary to
* include modules in your list that a parent class has already declared.
*
+ * @var array
+ *
* @see \Drupal\Tests\KernelTestBase::enableModules()
* @see \Drupal\Tests\KernelTestBase::bootKernel()
- *
- * @var array
*/
protected static $modules = [];
@@ -175,8 +175,9 @@ public function __construct(string $name) {
protected $vfsRoot;
/**
- * @todo Move into Config test base class.
* @var \Drupal\Core\Config\ConfigImporter
+ *
+ * @todo Move into Config test base class.
*/
protected $configImporter;
@@ -197,9 +198,9 @@ public function __construct(string $name) {
/**
* Set to TRUE to strict check all configuration saved.
*
- * @see \Drupal\Core\Config\Development\ConfigSchemaChecker
- *
* @var bool
+ *
+ * @see \Drupal\Core\Config\Development\ConfigSchemaChecker
*/
protected $strictConfigSchema = TRUE;
@@ -222,9 +223,9 @@ public function __construct(string $name) {
/**
* Set to TRUE to make user 1 a super user.
*
- * @see \Drupal\Core\Session\SuperUserAccessPolicy
- *
* @var bool
+ *
+ * @see \Drupal\Core\Session\SuperUserAccessPolicy
*/
protected bool $usesSuperUserAccessPolicy;
diff --git a/core/tests/Drupal/Tests/Component/Utility/RandomTest.php b/core/tests/Drupal/Tests/Component/Utility/RandomTest.php
index 0f34c21d17b8865b290560537e47a7d0745b710f..18ca097edeb46bd3f854d89c07c040abaa0bd214 100644
--- a/core/tests/Drupal/Tests/Component/Utility/RandomTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/RandomTest.php
@@ -19,9 +19,9 @@ class RandomTest extends TestCase {
/**
* The first random string passed to the test callback.
*
- * @see \Drupal\Tests\Component\Utility\RandomTest::_RandomStringValidate()
- *
* @var string
+ *
+ * @see \Drupal\Tests\Component\Utility\RandomTest::_RandomStringValidate()
*/
protected $firstStringGenerated = '';