diff --git a/core/authorize.php b/core/authorize.php
index fe374fa1e759fccffd64be375f0ccbb92d8043cc..475279912a6bc7e2eeadb6b0238f9a411468fc61 100644
--- a/core/authorize.php
+++ b/core/authorize.php
@@ -48,7 +48,7 @@
  * have access to the 'administer software updates' permission.
  *
  * @param \Symfony\Component\HttpFoundation\Request $request
- *  The incoming request.
+ *   The incoming request.
  *
  * @return bool
  *   TRUE if the current user can run authorize.php, and FALSE if not.
diff --git a/core/core.api.php b/core/core.api.php
index c4d78c523e3c26644afeb7ec44edfba9f8fdc050..a96ca631be301291a2c58735b38bb917439bed49 100644
--- a/core/core.api.php
+++ b/core/core.api.php
@@ -1957,34 +1957,34 @@ function hook_queue_info_alter(&$queues) {
  *
  * @param $message
  *   An array containing the message data. Keys in this array include:
- *  - 'id':
+ *   - 'id':
  *     The MailManagerInterface->mail() id of the message. Look at module source
  *     code or MailManagerInterface->mail() for possible id values.
- *  - 'to':
+ *   - 'to':
  *     The address or addresses the message will be sent to. The
  *     formatting of this string must comply with RFC 2822.
- *  - 'from':
+ *   - 'from':
  *     The address the message will be marked as being from, which is
  *     either a custom address or the site-wide default email address.
- *  - 'subject':
+ *   - 'subject':
  *     Subject of the email to be sent. This must not contain any newline
  *     characters, or the email may not be sent properly.
- *  - 'body':
+ *   - 'body':
  *     An array of strings or objects that implement
  *     \Drupal\Component\Render\MarkupInterface containing the message text. The
  *     message body is created by concatenating the individual array strings
  *     into a single text string using "\n\n" as a separator.
- *  - 'headers':
+ *   - 'headers':
  *     Associative array containing mail headers, such as From, Sender,
  *     MIME-Version, Content-Type, etc.
- *  - 'params':
+ *   - 'params':
  *     An array of optional parameters supplied by the caller of
  *     MailManagerInterface->mail() that is used to build the message before
  *     hook_mail_alter() is invoked.
- *  - 'language':
+ *   - 'language':
  *     The language object used to build the message before hook_mail_alter()
  *     is invoked.
- *  - 'send':
+ *   - 'send':
  *     Set to FALSE to abort sending this email message.
  *
  * @see \Drupal\Core\Mail\MailManagerInterface::mail()
diff --git a/core/includes/errors.inc b/core/includes/errors.inc
index 39d8ffd03bf1dfc6770db5733b64d67b5603523c..36d3a412d6deb5acea64bd1eceacbf99fe274e97 100644
--- a/core/includes/errors.inc
+++ b/core/includes/errors.inc
@@ -120,10 +120,10 @@ function error_displayable($error = NULL) {
  *   with the exception of @message, which needs to be an HTML string, and
  *   backtrace, which is a standard PHP backtrace.
  * @param bool $fatal
- *  TRUE for:
+ *   TRUE for:
  *   - An exception is thrown and not caught by something else.
  *   - A recoverable fatal error, which is a fatal error.
- *  Non-recoverable fatal errors cannot be logged by Drupal.
+ *   Non-recoverable fatal errors cannot be logged by Drupal.
  */
 function _drupal_log_error($error, $fatal = FALSE) {
   $is_installer = drupal_installation_attempted();
diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index da9f11b46fad2b9ceac0a6a1b2ec2c0f74d425a3..7a9812f4a65b502f1dcfe74d5e68a70ac85d5a59 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -1083,7 +1083,7 @@ function install_verify_completed_task() {
  * Verifies that settings.php specifies a valid database connection.
  *
  * @param string $site_path
- *  The site path.
+ *   The site path.
  *
  * @return bool
  *  TRUE if there are no database errors.
@@ -1377,7 +1377,7 @@ function install_retrieve_file($uri, $destination) {
  *  Checks if the localization server can be contacted.
  *
  * @param string $uri
- *  The URI to contact.
+ *   The URI to contact.
  *
  * @return string
  *   TRUE if the URI was contacted successfully, FALSE if not.
diff --git a/core/includes/install.inc b/core/includes/install.inc
index bae87d7699de26c2cd808c7e7e35c6e23e593896..31207994efab3d56bffe9d610c1577c5af1a51a4 100644
--- a/core/includes/install.inc
+++ b/core/includes/install.inc
@@ -715,11 +715,11 @@ function drupal_verify_install_file($file, $mask = NULL, $type = 'file') {
  * Creates a directory with the specified permissions.
  *
  * @param $file
- *  The name of the directory to create;
+ *   The name of the directory to create;
  * @param $mask
- *  The permissions of the directory to create.
+ *   The permissions of the directory to create.
  * @param $message
- *  (optional) Whether to output messages. Defaults to TRUE.
+ *   (optional) Whether to output messages. Defaults to TRUE.
  *
  * @return
  *  TRUE/FALSE whether or not the directory was successfully created.
@@ -764,11 +764,11 @@ function drupal_install_mkdir($file, $mask, $message = TRUE) {
  * 0700 and get the correct value of 0500.
  *
  * @param $file
- *  The name of the file with permissions to fix.
+ *   The name of the file with permissions to fix.
  * @param $mask
- *  The desired permissions for the file.
+ *   The desired permissions for the file.
  * @param $message
- *  (optional) Whether to output messages. Defaults to TRUE.
+ *   (optional) Whether to output messages. Defaults to TRUE.
  *
  * @return
  *  TRUE/FALSE whether or not we were able to fix the file's permissions.
diff --git a/core/lib/Drupal/Component/Diff/MappedDiff.php b/core/lib/Drupal/Component/Diff/MappedDiff.php
index 5350a6949bb970fe160fcdd37ba595e1462c5a12..10be64a78da4a9fdb532426bf9575de4eef1c3f6 100644
--- a/core/lib/Drupal/Component/Diff/MappedDiff.php
+++ b/core/lib/Drupal/Component/Diff/MappedDiff.php
@@ -20,18 +20,18 @@ class MappedDiff extends Diff {
    * changes in white-space.
    *
    * @param $from_lines array An array of strings.
-   *  (Typically these are lines from a file.)
+   *   (Typically these are lines from a file.)
    *
    * @param $to_lines array An array of strings.
    *
    * @param $mapped_from_lines array This array should
-   *  have the same size number of elements as $from_lines.
-   *  The elements in $mapped_from_lines and
-   *  $mapped_to_lines are what is actually compared
-   *  when computing the diff.
+   *   have the same size number of elements as $from_lines.
+   *   The elements in $mapped_from_lines and
+   *   $mapped_to_lines are what is actually compared
+   *   when computing the diff.
    *
    * @param $mapped_to_lines array This array should
-   *  have the same number of elements as $to_lines.
+   *   have the same number of elements as $to_lines.
    */
   public function __construct($from_lines, $to_lines, $mapped_from_lines, $mapped_to_lines) {
 
diff --git a/core/lib/Drupal/Component/Utility/Random.php b/core/lib/Drupal/Component/Utility/Random.php
index 4363ef932666ea77ac02efe3816271b1fe425a74..e26d4a046580a3a180820e56369fc6e4833e3326 100644
--- a/core/lib/Drupal/Component/Utility/Random.php
+++ b/core/lib/Drupal/Component/Utility/Random.php
@@ -134,7 +134,7 @@ public function name($length = 8, $unique = FALSE) {
    * Generate a string that looks like a word (letters only, alternating consonants and vowels).
    *
    * @param int $length
-   *  The desired word length.
+   *   The desired word length.
    *
    * @return string
    */
diff --git a/core/lib/Drupal/Core/Config/ConfigBase.php b/core/lib/Drupal/Core/Config/ConfigBase.php
index 9fc97c34a3c0152a465f9d6ae59dbef9757afcdc..6dfa962d1b0a2eac8d0e60b7e569c42bfb3e3df6 100644
--- a/core/lib/Drupal/Core/Config/ConfigBase.php
+++ b/core/lib/Drupal/Core/Config/ConfigBase.php
@@ -71,7 +71,7 @@ public function getName() {
    * Sets the name of this configuration object.
    *
    * @param string $name
-   *  The name of the configuration object.
+   *   The name of the configuration object.
    *
    * @return $this
    *   The configuration object.
@@ -85,7 +85,7 @@ public function setName($name) {
    * Validates the configuration object name.
    *
    * @param string $name
-   *  The name of the configuration object.
+   *   The name of the configuration object.
    *
    * @throws \Drupal\Core\Config\ConfigNameException
    *
diff --git a/core/lib/Drupal/Core/Config/ConfigInstaller.php b/core/lib/Drupal/Core/Config/ConfigInstaller.php
index 9034099bd29f45b27a834ace75141b4588b9ffb2..cc0d88f87ad2c1b80bfb29fb6e4aef3b4ece61b3 100644
--- a/core/lib/Drupal/Core/Config/ConfigInstaller.php
+++ b/core/lib/Drupal/Core/Config/ConfigInstaller.php
@@ -227,7 +227,7 @@ public function installOptionalConfig(StorageInterface $storage = NULL, $depende
    * @param StorageInterface $storage
    *   The configuration storage to read configuration from.
    * @param string $collection
-   *  The configuration collection to use.
+   *   The configuration collection to use.
    * @param string $prefix
    *   (optional) Limit to configuration starting with the provided string.
    * @param \Drupal\Core\Config\StorageInterface[] $profile_storages
diff --git a/core/lib/Drupal/Core/Database/Install/Tasks.php b/core/lib/Drupal/Core/Database/Install/Tasks.php
index ed2c4af51a8559d17e0196ff01eec48beb4a0f6b..28196154989b332f93cb1d282a289b5e0d380f77 100644
--- a/core/lib/Drupal/Core/Database/Install/Tasks.php
+++ b/core/lib/Drupal/Core/Database/Install/Tasks.php
@@ -196,7 +196,7 @@ protected function checkEngineVersion() {
    * Return driver specific configuration options.
    *
    * @param $database
-   *  An array of driver specific configuration options.
+   *   An array of driver specific configuration options.
    *
    * @return
    *   The options form array.
diff --git a/core/lib/Drupal/Core/Entity/EntityAccessControlHandlerInterface.php b/core/lib/Drupal/Core/Entity/EntityAccessControlHandlerInterface.php
index 11e82b3df06d01181c1cb55f7ce9164bd70079f7..0bec9c20397b3634f0fe39e85b23d6322a692ba8 100644
--- a/core/lib/Drupal/Core/Entity/EntityAccessControlHandlerInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityAccessControlHandlerInterface.php
@@ -91,7 +91,7 @@ public function setModuleHandler(ModuleHandlerInterface $module_handler);
    * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
    *   The field definition.
    * @param \Drupal\Core\Session\AccountInterface $account
-   *  (optional) The user session for which to check access, or NULL to check
+   *   (optional) The user session for which to check access, or NULL to check
    *   access for the current user. Defaults to NULL.
    * @param \Drupal\Core\Field\FieldItemListInterface $items
    *   (optional) The field values for which to check access, or NULL if access
diff --git a/core/lib/Drupal/Core/Entity/EntityStorageBase.php b/core/lib/Drupal/Core/Entity/EntityStorageBase.php
index cc4f95d8833a0be717d25edcdc88b947ef8cc141..70e4f7c7a5b61b36648c0bf58d00636262198df1 100644
--- a/core/lib/Drupal/Core/Entity/EntityStorageBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityStorageBase.php
@@ -158,7 +158,7 @@ protected function setStaticCache(array $entities) {
    *
    * @param string $hook
    *   One of 'presave', 'insert', 'update', 'predelete', 'delete', or
-   *  'revision_delete'.
+   *   'revision_delete'.
    * @param \Drupal\Core\Entity\EntityInterface  $entity
    *   The entity object.
    */
diff --git a/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php b/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php
index 6853227326dec30af362143cc83f950e149870a5..b86b5922c18c8bcd76da29eeb0b8489905079450 100644
--- a/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php
@@ -99,7 +99,7 @@ public function resetCache(array $entities = NULL);
    * @param \Drupal\Core\Field\FieldItemListInterface $items
    *   FieldItemList containing the values to be displayed.
    * @param string|array $display_options
-   *  Can be either:
+   *   Can be either:
    *   - The name of a view mode. The field will be displayed according to the
    *     display settings specified for this view mode in the $field
    *     definition for the field in the entity's bundle. If no display settings
diff --git a/core/lib/Drupal/Core/Field/BaseFieldDefinition.php b/core/lib/Drupal/Core/Field/BaseFieldDefinition.php
index f937b10f86b162f638917be459587d0c6331a2b9..594f31d14fbfad92fd2c25ae9d9eff934d8c1f88 100644
--- a/core/lib/Drupal/Core/Field/BaseFieldDefinition.php
+++ b/core/lib/Drupal/Core/Field/BaseFieldDefinition.php
@@ -266,7 +266,7 @@ public function getCardinality() {
    * FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED.
    *
    * @param int $cardinality
-   *  The field cardinality.
+   *   The field cardinality.
    *
    * @return $this
    */
diff --git a/core/lib/Drupal/Core/Form/EventSubscriber/FormAjaxSubscriber.php b/core/lib/Drupal/Core/Form/EventSubscriber/FormAjaxSubscriber.php
index 762a666032c6f9fc5492e98d556569d57fdcffd7..4d2d8fa86e4c87a0d2893f59552eadc219dc5c40 100644
--- a/core/lib/Drupal/Core/Form/EventSubscriber/FormAjaxSubscriber.php
+++ b/core/lib/Drupal/Core/Form/EventSubscriber/FormAjaxSubscriber.php
@@ -113,7 +113,7 @@ public function onException(GetResponseForExceptionEvent $event) {
    * Extracts a form AJAX exception.
    *
    * @param \Exception $e
-   *  A generic exception that might contain a form AJAX exception.
+   *   A generic exception that might contain a form AJAX exception.
    *
    * @return \Drupal\Core\Form\FormAjaxException|null
    *   Either the form AJAX exception, or NULL if none could be found.
diff --git a/core/lib/Drupal/Core/Form/FormBuilder.php b/core/lib/Drupal/Core/Form/FormBuilder.php
index 9c2dfcafc9e2a790785b891bbdf708795a8ed2b3..0da7c034d7d7111bc55a0fab378229e26ec68b53 100644
--- a/core/lib/Drupal/Core/Form/FormBuilder.php
+++ b/core/lib/Drupal/Core/Form/FormBuilder.php
@@ -650,8 +650,8 @@ public function renderPlaceholderFormAction() {
    * #lazy_builder callback; renders form CSRF token.
    *
    * @param string $placeholder
-   *  A string containing a placeholder, matching the value of the form's
-   *  #token.
+   *   A string containing a placeholder, matching the value of the form's
+   *   #token.
    *
    * @return array
    *   A renderable array containing the CSRF token.
diff --git a/core/lib/Drupal/Core/Menu/MenuLinkTreeElement.php b/core/lib/Drupal/Core/Menu/MenuLinkTreeElement.php
index a2137c0c670bf6e6c22566cb02f62f8feaf85c76..1327c78c549450aa0a278870deae7164166c8f64 100644
--- a/core/lib/Drupal/Core/Menu/MenuLinkTreeElement.php
+++ b/core/lib/Drupal/Core/Menu/MenuLinkTreeElement.php
@@ -93,7 +93,7 @@ class MenuLinkTreeElement {
    *   The depth of this element relative to the tree root.
    * @param bool $in_active_trail
    *   A flag as to whether this link was included in the list of active trail
-   *  IDs used to build the tree.
+   *   IDs used to build the tree.
    * @param \Drupal\Core\Menu\MenuLinkTreeElement[] $subtree
    *   The children of this element in the menu link tree.
    */
diff --git a/core/lib/Drupal/Core/PrivateKey.php b/core/lib/Drupal/Core/PrivateKey.php
index f00764f98d3a3ead3dad8abbb8c14152c8bb1804..9d0f73602a590facf82423a6830b6590babf2c4f 100644
--- a/core/lib/Drupal/Core/PrivateKey.php
+++ b/core/lib/Drupal/Core/PrivateKey.php
@@ -46,7 +46,7 @@ public function get() {
    * Sets the private key.
    *
    * @param string $key
-   *  The private key to set.
+   *   The private key to set.
    */
   public function set($key) {
     return $this->state->set('system.private_key', $key);
diff --git a/core/lib/Drupal/Core/Routing/CurrentRouteMatch.php b/core/lib/Drupal/Core/Routing/CurrentRouteMatch.php
index e0be041f796573425c164e429980e3e40e6924e9..195a48d574b859340283c94dc1610c50d6bca723 100644
--- a/core/lib/Drupal/Core/Routing/CurrentRouteMatch.php
+++ b/core/lib/Drupal/Core/Routing/CurrentRouteMatch.php
@@ -28,7 +28,7 @@ class CurrentRouteMatch implements ResettableStackedRouteMatchInterface {
    * Constructs a CurrentRouteMatch object.
    *
    * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
-   *  The request stack.
+   *   The request stack.
    */
   public function __construct(RequestStack $request_stack) {
     $this->requestStack = $request_stack;
diff --git a/core/lib/Drupal/Core/Routing/Enhancer/RouteEnhancerInterface.php b/core/lib/Drupal/Core/Routing/Enhancer/RouteEnhancerInterface.php
index a98317cc4ab984a44d0d06f28c6466bcbcfe3552..d6be823b5e151ce1f26fa99d50e20630122c7ca9 100644
--- a/core/lib/Drupal/Core/Routing/Enhancer/RouteEnhancerInterface.php
+++ b/core/lib/Drupal/Core/Routing/Enhancer/RouteEnhancerInterface.php
@@ -14,7 +14,7 @@ interface RouteEnhancerInterface extends BaseRouteEnhancerInterface {
    * Declares if the route enhancer applies to the given route.
    *
    * @param \Symfony\Component\Routing\Route $route
-   *  The route to consider attaching to.
+   *   The route to consider attaching to.
    *
    * @return bool
    *   TRUE if the check applies to the passed route, False otherwise.
diff --git a/core/lib/Drupal/Core/Routing/RouteFilterInterface.php b/core/lib/Drupal/Core/Routing/RouteFilterInterface.php
index cd991af82cbb33130946a305e29b176289bf1027..a3ccb4486f7d636e48352918c8e17797d5457c7f 100644
--- a/core/lib/Drupal/Core/Routing/RouteFilterInterface.php
+++ b/core/lib/Drupal/Core/Routing/RouteFilterInterface.php
@@ -14,7 +14,7 @@ interface RouteFilterInterface extends BaseRouteFilterInterface {
    * Determines if the route filter applies to the given route.
    *
    * @param \Symfony\Component\Routing\Route $route
-   *  The route to consider attaching to.
+   *   The route to consider attaching to.
    *
    * @return bool
    *   TRUE if the check applies to the passed route, FALSE otherwise.
diff --git a/core/lib/Drupal/Core/Routing/RouteMatch.php b/core/lib/Drupal/Core/Routing/RouteMatch.php
index dbffc0d457c8befeeea190a64604dbf208977025..29ff5c6c4c038e3496a55a71416044feca80a8d8 100644
--- a/core/lib/Drupal/Core/Routing/RouteMatch.php
+++ b/core/lib/Drupal/Core/Routing/RouteMatch.php
@@ -44,7 +44,7 @@ class RouteMatch implements RouteMatchInterface {
    * Constructs a RouteMatch object.
    *
    * @param string $route_name
-   *  The name of the route.
+   *   The name of the route.
    * @param \Symfony\Component\Routing\Route $route
    *   The route.
    * @param array $parameters
diff --git a/core/lib/Drupal/Core/Routing/UrlGenerator.php b/core/lib/Drupal/Core/Routing/UrlGenerator.php
index 2aef584d22afcc245525ce25df419fe2ba125bc1..af0ad304e334dd8513e4d86e1148a0752887b902 100644
--- a/core/lib/Drupal/Core/Routing/UrlGenerator.php
+++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php
@@ -245,10 +245,10 @@ protected function doGenerate(array $variables, array $defaults, array $tokens,
    * @param $name
    *   The route name or other debug message.
    * @param \Symfony\Component\Routing\Route $route
-   *  The route object.
+   *   The route object.
    * @param array $parameters
-   *  An array of parameters as passed to
-   *  \Symfony\Component\Routing\Generator\UrlGeneratorInterface::generate().
+   *   An array of parameters as passed to
+   *   \Symfony\Component\Routing\Generator\UrlGeneratorInterface::generate().
    * @param array $query_params
    *   An array of query string parameter, which will get any extra values from
    *   $parameters merged in.
diff --git a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
index 2352f84424ef0c9629de2ff8147aee3e485279ec..9a314edd340eb8a0c8c94a3260c83ad448c3697d 100644
--- a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
+++ b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
@@ -15,10 +15,10 @@ interface UrlGeneratorInterface extends VersatileGeneratorInterface {
    * Gets the internal path (system path) for a route.
    *
    * @param string|\Symfony\Component\Routing\Route $name
-   *  The route name or a route object.
+   *   The route name or a route object.
    * @param array $parameters
-   *  An array of parameters as passed to
-   *  \Symfony\Component\Routing\Generator\UrlGeneratorInterface::generate().
+   *   An array of parameters as passed to
+   *   \Symfony\Component\Routing\Generator\UrlGeneratorInterface::generate().
    *
    * @return string
    *  The internal Drupal path corresponding to the route.
diff --git a/core/lib/Drupal/Core/TypedData/ListInterface.php b/core/lib/Drupal/Core/TypedData/ListInterface.php
index b4a5a9f87132ada848d04d0092edf37c75a6c789..1dab39a0f71e45567a3db8a5cfb08a3b73bb84b9 100644
--- a/core/lib/Drupal/Core/TypedData/ListInterface.php
+++ b/core/lib/Drupal/Core/TypedData/ListInterface.php
@@ -62,9 +62,9 @@ public function get($index);
    * @param int $index
    *   The position of the item in the list. Since a List only contains
    *   sequential, 0-based indexes, $index has to be:
-   * - Either the position of an existing item in the list. This updates the
+   *   - Either the position of an existing item in the list. This updates the
    *   item value.
-   * - Or the next available position in the sequence of the current list
+   *   - Or the next available position in the sequence of the current list
    *   indexes. This appends a new item with the provided value at the end of
    *   the list.
    * @param mixed $value
diff --git a/core/lib/Drupal/Core/Updater/UpdaterInterface.php b/core/lib/Drupal/Core/Updater/UpdaterInterface.php
index 115280e1017a8a2c7af6c90af3913877b7450997..c093c4be1c026a56b10350425683529d4d9e6740 100644
--- a/core/lib/Drupal/Core/Updater/UpdaterInterface.php
+++ b/core/lib/Drupal/Core/Updater/UpdaterInterface.php
@@ -25,7 +25,7 @@ public function isInstalled();
    * Returns the system name of the project.
    *
    * @param string $directory
-   *  A directory containing a project.
+   *   A directory containing a project.
    */
   public static function getProjectName($directory);
 
diff --git a/core/lib/Drupal/Core/Utility/token.api.php b/core/lib/Drupal/Core/Utility/token.api.php
index d39d66f10744eac6340872a45943de057061f624..56d8f3a5fb8a58e29095eacd7d4cbe295d764bbf 100644
--- a/core/lib/Drupal/Core/Utility/token.api.php
+++ b/core/lib/Drupal/Core/Utility/token.api.php
@@ -36,7 +36,7 @@
  * @param array $data
  *   An associative array of data objects to be used when generating replacement
  *   values, as supplied in the $data parameter to
- *  \Drupal\Core\Utility\Token::replace().
+ *   \Drupal\Core\Utility\Token::replace().
  * @param array $options
  *   An associative array of options for token replacement; see
  *   \Drupal\Core\Utility\Token::replace() for possible values.
diff --git a/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php b/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php
index d698d2ed1390584b2fe9c9da0008cd11c3868874..94135fd3f6f9e622e3d7760589cb07935a320a33 100644
--- a/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php
+++ b/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php
@@ -29,15 +29,15 @@ class BlockedIP extends DestinationBase implements ContainerFactoryPluginInterfa
    * Constructs a BlockedIP object.
    *
    * @param array $configuration
-   *  Plugin configuration.
+   *   Plugin configuration.
    * @param string $plugin_id
-   *  The plugin ID.
+   *   The plugin ID.
    * @param mixed $plugin_definition
-   *  The plugin definiiton.
+   *   The plugin definiiton.
    * @param \Drupal\migrate\Plugin\MigrationInterface $migration
-   *  The current migration.
+   *   The current migration.
    * @param \Drupal\ban\BanIpManagerInterface $ban_manager
-   *  The IP manager service.
+   *   The IP manager service.
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, BanIpManagerInterface $ban_manager) {
     parent::__construct($configuration, $plugin_id, $plugin_definition, $migration);
diff --git a/core/modules/block/src/BlockForm.php b/core/modules/block/src/BlockForm.php
index 50149b169b4114b10e5af70b91c17aab01355496..eeec4d3338a8ef1e7afd6925b75c00e1fe925c0d 100644
--- a/core/modules/block/src/BlockForm.php
+++ b/core/modules/block/src/BlockForm.php
@@ -80,7 +80,7 @@ class BlockForm extends EntityForm {
    * @param \Drupal\Core\Language\LanguageManagerInterface $language
    *   The language manager.
    * @param \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler
-   * The theme handler.
+   *   The theme handler.
    */
   public function __construct(EntityManagerInterface $entity_manager, ExecutableManagerInterface $manager, ContextRepositoryInterface $context_repository, LanguageManagerInterface $language, ThemeHandlerInterface $theme_handler) {
     $this->storage = $entity_manager->getStorage('block');
diff --git a/core/modules/comment/src/CommentLazyBuilders.php b/core/modules/comment/src/CommentLazyBuilders.php
index a05228afe5dfacaf1b9a0533627e576ac1a3eb9e..4eeeb59d0c0c25d438c1e994eed17b6c81d3f3f8 100644
--- a/core/modules/comment/src/CommentLazyBuilders.php
+++ b/core/modules/comment/src/CommentLazyBuilders.php
@@ -120,7 +120,7 @@ public function renderForm($commented_entity_type_id, $commented_entity_id, $fie
    * @param string $langcode
    *   The language in which the comment entity is being viewed.
    * @param bool $is_in_preview
-   *  Whether the comment is currently being previewed.
+   *   Whether the comment is currently being previewed.
    *
    * @return array
    *   A renderable array representing the comment links.
diff --git a/core/modules/file/src/Plugin/migrate/destination/EntityFile.php b/core/modules/file/src/Plugin/migrate/destination/EntityFile.php
index 24b09e5c2560705f9f9250bd1fcca186433e24cc..981706f63e0d931d137a717df5d24f2280186e43 100644
--- a/core/modules/file/src/Plugin/migrate/destination/EntityFile.php
+++ b/core/modules/file/src/Plugin/migrate/destination/EntityFile.php
@@ -187,7 +187,7 @@ protected function getOverwriteMode(Row $row) {
    * API functions (such as file_prepare_directory()).
    *
    * @param string $uri
-   *  The URI or path.
+   *   The URI or path.
    *
    * @return string|false
    *  The directory component of the path or URI, or FALSE if it could not
@@ -208,9 +208,9 @@ protected function getDirectory($uri) {
    * If either URI is a remote stream, will return FALSE.
    *
    * @param string $source
-   *  The source URI.
+   *   The source URI.
    * @param string $destination
-   *  The destination URI.
+   *   The destination URI.
    *
    * @return bool
    *  TRUE if the source and destination URIs refer to the same physical path,
@@ -233,7 +233,7 @@ protected function isLocationUnchanged($source, $destination) {
    * \Drupal\Core\StreamWrapper\LocalStream.
    *
    * @param string $uri
-   *  The URI or path to test.
+   *   The URI or path to test.
    *
    * @return bool
    */
diff --git a/core/modules/forum/src/ForumUninstallValidator.php b/core/modules/forum/src/ForumUninstallValidator.php
index 6cf85618cf87f7c47781411244dfb05f880e657b..b2bb98b371ba0ab44fd1cae375c619e18df8ee21 100644
--- a/core/modules/forum/src/ForumUninstallValidator.php
+++ b/core/modules/forum/src/ForumUninstallValidator.php
@@ -47,7 +47,7 @@ class ForumUninstallValidator implements ModuleUninstallValidatorInterface {
    * @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
    *   The entity query factory.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *  The config factory.
+   *   The config factory.
    * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
    *   The string translation service.
    */
diff --git a/core/modules/image/src/Tests/ImageFieldTestBase.php b/core/modules/image/src/Tests/ImageFieldTestBase.php
index 9a2e5c2277883c5347b381a1f82b9c052db25e18..6081d32efbd3a051ecec7fd43f20edc7a0182226 100644
--- a/core/modules/image/src/Tests/ImageFieldTestBase.php
+++ b/core/modules/image/src/Tests/ImageFieldTestBase.php
@@ -135,7 +135,7 @@ function previewNodeImage($image, $field_name, $type) {
    * @param $type
    *   The type of node to create.
    * @param $alt
-   *  The alt text for the image. Use if the field settings require alt text.
+   *   The alt text for the image. Use if the field settings require alt text.
    */
   function uploadNodeImage($image, $field_name, $type, $alt = '') {
     $edit = array(
diff --git a/core/modules/menu_ui/src/Tests/MenuTest.php b/core/modules/menu_ui/src/Tests/MenuTest.php
index 835ce9b45dc619a28a61ebfad2ce071d8b5546ba..95d9007feda111f9c7253d1c12f74c822069b635 100644
--- a/core/modules/menu_ui/src/Tests/MenuTest.php
+++ b/core/modules/menu_ui/src/Tests/MenuTest.php
@@ -596,7 +596,7 @@ public function testBlockContextualLinks() {
    *   test whether it works when we do the authenticatedUser tests. Defaults
    *   to FALSE.
    * @param string $weight
-   *  Menu weight. Defaults to 0.
+   *   Menu weight. Defaults to 0.
    *
    * @return \Drupal\menu_link_content\Entity\MenuLinkContent
    *   A menu link entity.
diff --git a/core/modules/migrate/src/Plugin/MigrationInterface.php b/core/modules/migrate/src/Plugin/MigrationInterface.php
index 6d47b174900d5ef75b0f0448525f1ff8734fa242..f61add01b4f459a50a500e8ceb856175bfc69140 100644
--- a/core/modules/migrate/src/Plugin/MigrationInterface.php
+++ b/core/modules/migrate/src/Plugin/MigrationInterface.php
@@ -137,7 +137,7 @@ public function getProcessPlugins(array $process = NULL);
    * Returns the initialized destination plugin.
    *
    * @param bool $stub_being_requested
-   *  TRUE to indicate that this destination will be asked to construct a stub.
+   *   TRUE to indicate that this destination will be asked to construct a stub.
    *
    * @return \Drupal\migrate\Plugin\MigrateDestinationInterface
    *   The destination plugin.
@@ -271,10 +271,10 @@ public function setProcessOfProperty($property, $process_of_property);
    *
    * @param string $property
    *   The property of which to merge the passed in process pipeline
-   * configuration.
+   *   configuration.
    * @param array $process_of_property
    *   The process pipeline configuration to be merged with the existing process
-   * pipeline configuration.
+   *   pipeline configuration.
    *
    * @return $this
    *   The migration entity.
diff --git a/core/modules/node/src/NodeStorageInterface.php b/core/modules/node/src/NodeStorageInterface.php
index 8c8f8c1bdf2ff27e2b5910e90755ddc2038466cd..70562ff46dd586c61bf97aa3bec6327642fb17aa 100644
--- a/core/modules/node/src/NodeStorageInterface.php
+++ b/core/modules/node/src/NodeStorageInterface.php
@@ -61,7 +61,7 @@ public function updateType($old_type, $new_type);
    * Unsets the language for all nodes with the given language.
    *
    * @param \Drupal\Core\Language\LanguageInterface $language
-   *  The language object.
+   *   The language object.
    */
   public function clearRevisionsLanguage(LanguageInterface $language);
 }
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTypeTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTypeTest.php
index 7ec5477aaa648e60ff42093a3f1d99be7100c135..118b08a4ef1b9340c700509afc9eb345b773ed7c 100644
--- a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTypeTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTypeTest.php
@@ -36,13 +36,13 @@ protected function setUp() {
    *
    * @dataProvider testNodeTypeDataProvider
    * @param string $id
-   *  The node type ID.
+   *   The node type ID.
    * @param string $label
-   *  The expected label.
+   *   The expected label.
    * @param string $description
-   *  The expected node type description.
+   *   The expected node type description.
    * @param string $help
-   *  The expected help text.
+   *   The expected help text.
    */
   protected function assertEntity($id, $label, $description, $help, $display_submitted, $new_revision, $body_label = NULL) {
     /** @var \Drupal\node\NodeTypeInterface $entity */
diff --git a/core/modules/options/options.module b/core/modules/options/options.module
index 5d3d671bf299ecb33d95afef321dbe434feb1e71..90b70ff2befebf3bdee9b00f876fbe80ab250153 100644
--- a/core/modules/options/options.module
+++ b/core/modules/options/options.module
@@ -59,7 +59,7 @@ function options_field_storage_config_delete(FieldStorageConfigInterface $field_
  * @param \Drupal\Core\Entity\FieldableEntityInterface|NULL $entity
  *   (optional) The specific entity when this function is called from the
  *   context of a specific field on a specific entity. This allows custom
- *  'allowed_values_function' callbacks to either restrict the values or
+ *   'allowed_values_function' callbacks to either restrict the values or
  *   customize the labels for particular bundles and entities. NULL when
  *   there is not a specific entity available, such as for Views filters.
  *
diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
index 51012085c062d24b987c4e24b01064e56d1d3125..c0fbc9035bc8db7243b7b4d234e5388a1b8b8c3f 100644
--- a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
+++ b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
@@ -162,7 +162,7 @@ protected function addTestImageStyleMappings($empty_styles = FALSE) {
    *   File scheme to use.
    * @param bool $empty_styles
    *   If true, use an empty string for image style names.
-   * Defaults to false.
+   *   Defaults to false.
    */
   protected function doTestResponsiveImageFieldFormatters($scheme, $empty_styles = FALSE) {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
diff --git a/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
index 013164724632be490f4c0085af46b910bda4f7da..c59a74a820abc4fec4fd56fb3be0710f8428683b 100644
--- a/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
+++ b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
@@ -226,7 +226,7 @@ protected function selectViewMode($entity_type) {
    * Creates a referencing and a non-referencing entity for testing purposes.
    *
    * @param \Drupal\Core\Entity\EntityInterface $referenced_entity
-   *  The entity that the referencing entity should reference.
+   *   The entity that the referencing entity should reference.
    *
    * @return \Drupal\Core\Entity\EntityInterface[]
    *  An array containing a referencing entity and a non-referencing entity.
diff --git a/core/modules/toolbar/src/Element/Toolbar.php b/core/modules/toolbar/src/Element/Toolbar.php
index 09dc071cbcc3c1ab8de978b5ff0e8c8643f684be..c9daf89e562a8fccce48f2e9d184a7f8765a67bf 100644
--- a/core/modules/toolbar/src/Element/Toolbar.php
+++ b/core/modules/toolbar/src/Element/Toolbar.php
@@ -56,7 +56,7 @@ public function getInfo() {
    * rendering to ensure that it is built only if it will be displayed.
    *
    * @param array $element
-   *  A renderable array.
+   *   A renderable array.
    *
    * @return array
    *  A renderable array.
diff --git a/core/modules/tour/tests/tour_test/src/Controller/TourTestController.php b/core/modules/tour/tests/tour_test/src/Controller/TourTestController.php
index 2025ce67eaf412482fdc8ce552b4da3629032648..87b817df7bf7bac854c0a7dad39553202534b5fe 100644
--- a/core/modules/tour/tests/tour_test/src/Controller/TourTestController.php
+++ b/core/modules/tour/tests/tour_test/src/Controller/TourTestController.php
@@ -11,7 +11,7 @@ class TourTestController {
    * Outputs some content for testing tours.
    *
    * @param string $locale
-   *  (optional) Dummy locale variable for testing routing parameters. Defaults
+   *   (optional) Dummy locale variable for testing routing parameters. Defaults
    *   to 'foo'.
    *
    * @return array
diff --git a/core/modules/tracker/tracker.module b/core/modules/tracker/tracker.module
index 5f20780802a8411dd51e9c2643c952e21a5db74e..54d490d93f360d63e9cb2d84cd1778c6ccdb0706 100644
--- a/core/modules/tracker/tracker.module
+++ b/core/modules/tracker/tracker.module
@@ -304,7 +304,7 @@ function _tracker_calculate_changed($node) {
  * Cleans up indexed data when nodes or comments are removed.
  *
  * @param int $nid
- *  The node ID.
+ *   The node ID.
  * @param int $uid
  *   The author of the node or comment.
  * @param int $changed
diff --git a/core/modules/update/src/Form/UpdateManagerUpdate.php b/core/modules/update/src/Form/UpdateManagerUpdate.php
index c9388b8ce3d1e688533b86ecc67bc10fab17d39d..44b7f62695e42a41ab6e2c1b25dfd0bd0218c736 100644
--- a/core/modules/update/src/Form/UpdateManagerUpdate.php
+++ b/core/modules/update/src/Form/UpdateManagerUpdate.php
@@ -34,7 +34,7 @@ class UpdateManagerUpdate extends FormBase {
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
    *   The module handler.
    * @param \Drupal\Core\State\StateInterface $state
-   *  The state service.
+   *   The state service.
    */
   public function __construct(ModuleHandlerInterface $module_handler, StateInterface $state) {
     $this->moduleHandler = $module_handler;
diff --git a/core/modules/update/src/UpdateRootFactory.php b/core/modules/update/src/UpdateRootFactory.php
index 55efd31cbf7a5ccc51c4240c8dd98d8294290209..44fc272d44c3b3f7ca694c331510391494ead449 100644
--- a/core/modules/update/src/UpdateRootFactory.php
+++ b/core/modules/update/src/UpdateRootFactory.php
@@ -30,7 +30,7 @@ class UpdateRootFactory {
    * @param \Drupal\Core\DrupalKernelInterface $drupal_kernel
    *   The Drupal kernel.
    * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
-   *  The request stack.
+   *   The request stack.
    */
   public function __construct(DrupalKernelInterface $drupal_kernel, RequestStack $request_stack) {
     $this->drupalKernel = $drupal_kernel;
diff --git a/core/modules/views/src/Controller/ViewAjaxController.php b/core/modules/views/src/Controller/ViewAjaxController.php
index e2686415ff284ebf79385f6b36e97482b99a8bbb..022f4d7d3ca040f741bc3adada5b2e10c51cff07 100644
--- a/core/modules/views/src/Controller/ViewAjaxController.php
+++ b/core/modules/views/src/Controller/ViewAjaxController.php
@@ -101,7 +101,7 @@ public static function create(ContainerInterface $container) {
    * Loads and renders a view via AJAX.
    *
    * @param \Symfony\Component\HttpFoundation\Request $request
-   *  The current request object.
+   *   The current request object.
    *
    * @return \Drupal\views\Ajax\ViewAjaxResponse
    *  The view response as ajax response.
diff --git a/core/modules/views/src/Plugin/views/area/AreaPluginBase.php b/core/modules/views/src/Plugin/views/area/AreaPluginBase.php
index 5d1303944aa9cdd2d2e7f45a57907030522ac9db..2ad7f46be9b82409826df691b314e2a6fa4ee941 100644
--- a/core/modules/views/src/Plugin/views/area/AreaPluginBase.php
+++ b/core/modules/views/src/Plugin/views/area/AreaPluginBase.php
@@ -93,7 +93,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
    * Performs any operations needed before full rendering.
    *
    * @param array $results
-   *  The results of the view.
+   *   The results of the view.
    */
   public function preRender(array $results) {
   }
diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
index a506594ae4a9800d38ac9851d49ce103ff71b2b4..4e4bf7f4fbf7c77b7ced21dc04a6fddb6b1cc3e0 100644
--- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
+++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
@@ -143,11 +143,11 @@ public function query() {
    * Add 'additional' fields to the query.
    *
    * @param $fields
-   * An array of fields. The key is an identifier used to later find the
-   * field alias used. The value is either a string in which case it's
-   * assumed to be a field on this handler's table; or it's an array in the
-   * form of
-   * @code array('table' => $tablename, 'field' => $fieldname) @endcode
+   *   An array of fields. The key is an identifier used to later find the
+   *   field alias used. The value is either a string in which case it's
+   *   assumed to be a field on this handler's table; or it's an array in the
+   *   form of
+   *   @code array('table' => $tablename, 'field' => $fieldname) @endcode
    */
   protected function addAdditionalFields($fields = NULL) {
     if (!isset($fields)) {
diff --git a/core/modules/views/src/Tests/ViewResultAssertionTrait.php b/core/modules/views/src/Tests/ViewResultAssertionTrait.php
index d48d139e4f0b502c35536d055527fc9aa144f4d3..62ae67ce24d8d4422ca0898fb41a1682737e2c00 100644
--- a/core/modules/views/src/Tests/ViewResultAssertionTrait.php
+++ b/core/modules/views/src/Tests/ViewResultAssertionTrait.php
@@ -45,7 +45,7 @@ protected function assertIdenticalResultset($view, $expected_result, $column_map
    *   An expected result set.
    * @param array $column_map
    *   (optional) An associative array mapping the columns of the result set
-   *  from the view (as keys) and the expected result set (as values).
+   *   from the view (as keys) and the expected result set (as values).
    * @param string $message
    *   (optional) A custom message to display with the assertion. Defaults to
    *   'Non-identical result set.'
diff --git a/core/modules/views/src/Views.php b/core/modules/views/src/Views.php
index a09d33aab8e6a4efe741603a5ea88e32694ede1b..10d824080bb49554f5a75d907ed14ebd923e8ac0 100644
--- a/core/modules/views/src/Views.php
+++ b/core/modules/views/src/Views.php
@@ -278,21 +278,21 @@ public static function getDisabledViews() {
    * checkboxes and radios as #options.
    *
    * @param bool $views_only
-   *  If TRUE, only return views, not displays.
+   *   If TRUE, only return views, not displays.
    * @param string $filter
-   *  Filters the views on status. Can either be 'all' (default), 'enabled' or
-   *  'disabled'
+   *   Filters the views on status. Can either be 'all' (default), 'enabled' or
+   *   'disabled'
    * @param mixed $exclude_view
-   *  view or current display to exclude
-   *  either a
-   *  - views object (containing $exclude_view->storage->name and $exclude_view->current_display)
-   *  - views name as string:  e.g. my_view
-   *  - views name and display id (separated by ':'): e.g. my_view:default
+   *   view or current display to exclude
+   *   either a
+   *   - views object (containing $exclude_view->storage->name and $exclude_view->current_display)
+   *   - views name as string:  e.g. my_view
+   *   - views name and display id (separated by ':'): e.g. my_view:default
    * @param bool $optgroup
-   *  If TRUE, returns an array with optgroups for each view (will be ignored for
-   *  $views_only = TRUE). Can be used by select
+   *   If TRUE, returns an array with optgroups for each view (will be ignored for
+   *   $views_only = TRUE). Can be used by select
    * @param bool $sort
-   *  If TRUE, the list of views is sorted ascending.
+   *   If TRUE, the list of views is sorted ascending.
    *
    * @return array
    *  an associative array for use in select.
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php b/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
index 75722dc5f2b34508cb06736136480d4aabfe7374..5fd49a7ad2447feb03df3ce81a96f642f9e0281f 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
@@ -1110,7 +1110,7 @@ class RecursivePlaceholdersTest {
    * #lazy_builder callback; bubbles another placeholder.
    *
    * @param string $animal
-   *  An animal.
+   *   An animal.
    *
    * @return array
    *   A renderable array.
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php b/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
index a0ea1bbf92677052113f4d20c6177c45f9564614..6dcf46915a8fe1eccc0003eae14e6c767c91bb28 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
@@ -258,7 +258,7 @@ class PlaceholdersTest {
    * #lazy_builder callback; attaches setting, generates markup.
    *
    * @param string $animal
-   *  An animal.
+   *   An animal.
    *
    * @return array
    *   A renderable array.
@@ -282,7 +282,7 @@ public static function callback($animal, $use_animal_as_array_key = FALSE) {
    * #lazy_builder callback; attaches setting, generates markup, user-specific.
    *
    * @param string $animal
-   *  An animal.
+   *   An animal.
    *
    * @return array
    *   A renderable array.
@@ -297,7 +297,7 @@ public static function callbackPerUser($animal) {
    * #lazy_builder callback; attaches setting, generates markup, cache tag.
    *
    * @param string $animal
-   *  An animal.
+   *   An animal.
    *
    * @return array
    *   A renderable array.