diff --git a/core/core.api.php b/core/core.api.php
index 3b07651..8edb308 100644
--- a/core/core.api.php
+++ b/core/core.api.php
@@ -2277,7 +2277,8 @@ function hook_rebuild() {
  *     }
  *   </code>
  *   For more information on creating batches, see the
- *   @link batch Batch operations @endlink documentation.
+ *
+   * @link batch Batch operations @endlink documentation.
  *
  * @see callback_batch_operation()
  * @see \Drupal\Core\Config\ConfigImporter::initialize()
diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index ae2f891..6ff450a 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -448,7 +448,8 @@ function watchdog_exception($type, Exception $exception, $message = NULL, $varia
  *     safe. Non-safe strings will be escaped automatically.
  *   - message: The message string.
  *   So, the following is an example of the full return array structure:
- *   @code
+ *
+   * @code
  *     array(
  *       'status' => array(
  *         array(
diff --git a/core/includes/form.inc b/core/includes/form.inc
index d99dca2..9e80099 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -671,7 +671,8 @@ function template_preprocess_form_element_label(&$variables) {
  *     item is an array consisting of the name of an implementation of
  *     callback_batch_operation() and an array of parameter.
  *     Example:
- *     @code
+ *
+     * @code
  *     array(
  *       array('callback_batch_operation_1', array($arg1)),
  *       array('callback_batch_operation_2', array($arg2_1, $arg2_2)),
diff --git a/core/includes/install.inc b/core/includes/install.inc
index 3529d51..1a7b255 100644
--- a/core/includes/install.inc
+++ b/core/includes/install.inc
@@ -201,7 +201,8 @@ function drupal_get_database_types() {
  *   An array of settings that need to be updated. Multidimensional arrays
  *   are dumped up to a stdClass object. The object can have value, required
  *   and comment properties.
- *   @code
+ *
+   * @code
  *   $settings['config_directories'] = array(
  *     CONFIG_SYNC_DIRECTORY => (object) array(
  *       'value' => 'config_hash/sync',
@@ -432,6 +433,7 @@ function _drupal_rewrite_settings_global(&$ref, $variable) {
  *   The container for variable values.
  * @param string $variable_name
  *   Name of variable.
+ *
  * @return string
  *   A string containing valid PHP code of the variable suitable for placing
  *   into settings.php.
@@ -463,6 +465,7 @@ function _drupal_rewrite_settings_dump($variable, $variable_name) {
  *   A string to prepend to the variable's value.
  * @param string $suffix
  *   A string to append to the variable's value.
+ *
  * @return string
  *   A string containing valid PHP code of the variable suitable for placing
  *   into settings.php.
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index ac085b4..ec06701 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -844,7 +844,8 @@ function template_preprocess_image(&$variables) {
  *     - header: Indicates this cell is a header.
  *     - Any HTML attributes, such as "colspan", to apply to the table cell.
  *     Here's an example for $rows:
- *     @code
+ *
+     * @code
  *     $rows = array(
  *       // Simple row
  *       array(
diff --git a/core/lib/Drupal/Component/Datetime/DateTimePlus.php b/core/lib/Drupal/Component/Datetime/DateTimePlus.php
index 1161168..d0d0a6c 100644
--- a/core/lib/Drupal/Component/Datetime/DateTimePlus.php
+++ b/core/lib/Drupal/Component/Datetime/DateTimePlus.php
@@ -129,7 +129,8 @@ class DateTimePlus {
    * @param \DateTime $datetime
    *   A DateTime object.
    * @param array $settings
-   *   @see __construct()
+   *
+     * @see __construct()
    *
    * @return static
    *   A new DateTimePlus object.
@@ -183,9 +184,11 @@ public static function createFromArray(array $date_parts, $timezone = NULL, $set
    * @param int $timestamp
    *   A UNIX timestamp.
    * @param mixed $timezone
-   *   @see __construct()
+   *
+     * @see __construct()
    * @param array $settings
-   *   @see __construct()
+   *
+     * @see __construct()
    *
    * @return static
    *   A new DateTimePlus object.
@@ -210,11 +213,14 @@ public static function createFromTimestamp($timestamp, $timezone = NULL, $settin
    *   to use things like negative years, which php's parser fails on, or
    *   any other specialized input with a known format. If provided the
    *   date will be created using the createFromFormat() method.
-   *   @see http://php.net/manual/datetime.createfromformat.php
+   *
+     * @see http://php.net/manual/datetime.createfromformat.php
    * @param mixed $time
-   *   @see __construct()
+   *
+     * @see __construct()
    * @param mixed $timezone
-   *   @see __construct()
+   *
+     * @see __construct()
    * @param array $settings
    *   - validate_format: (optional) Boolean choice to validate the
    *     created date using the input format. The format used in
@@ -223,7 +229,8 @@ public static function createFromTimestamp($timestamp, $timezone = NULL, $settin
    *     possible to a validation step to confirm that the date created
    *     from a format string exactly matches the input. This option
    *     indicates the format can be used for validation. Defaults to TRUE.
-   *   @see __construct()
+   *
+     * @see __construct()
    *
    * @return static
    *   A new DateTimePlus object.
@@ -280,7 +287,8 @@ public static function createFromFormat($format, $time, $timezone = NULL, $setti
    *   parameter and the current timezone are ignored when the $time parameter
    *   either is a UNIX timestamp (e.g. @946684800) or specifies a timezone
    *   (e.g. 2010-01-28T15:00:00+02:00).
-   *   @see http://php.net/manual/datetime.construct.php
+   *
+     * @see http://php.net/manual/datetime.construct.php
    * @param array $settings
    *   (optional) Keyed array of settings. Defaults to empty array.
    *   - langcode: (optional) String two letter language code used to control
diff --git a/core/lib/Drupal/Component/Discovery/YamlDiscovery.php b/core/lib/Drupal/Component/Discovery/YamlDiscovery.php
index f13e60b..0b578ad 100644
--- a/core/lib/Drupal/Component/Discovery/YamlDiscovery.php
+++ b/core/lib/Drupal/Component/Discovery/YamlDiscovery.php
@@ -74,6 +74,7 @@ public function findAll() {
    *
    * @param string $file
    *   Yaml file path.
+   *
    * @return array
    */
   protected function decode($file) {
diff --git a/core/lib/Drupal/Component/Gettext/PoHeader.php b/core/lib/Drupal/Component/Gettext/PoHeader.php
index 5dd13a5..41fc3b3 100644
--- a/core/lib/Drupal/Component/Gettext/PoHeader.php
+++ b/core/lib/Drupal/Component/Gettext/PoHeader.php
@@ -473,6 +473,7 @@ private function tokenizeFormula($formula) {
    *   Number of the plural string to be used for the given plural value.
    *
    * @see parseArithmetic()
+   *
    * @throws Exception
    */
   protected function evaluatePlural($element_stack, $n) {
diff --git a/core/lib/Drupal/Component/Graph/Graph.php b/core/lib/Drupal/Component/Graph/Graph.php
index b155faa..edbb681 100644
--- a/core/lib/Drupal/Component/Graph/Graph.php
+++ b/core/lib/Drupal/Component/Graph/Graph.php
@@ -22,7 +22,8 @@ class Graph {
    *   an edge. Values of array elements are copied over.
    *
    *   Example:
-   *   @code
+   *
+     * @code
    *     $graph[1]['edges'][2] = 1;
    *     $graph[2]['edges'][3] = 1;
    *     $graph[2]['edges'][4] = 1;
diff --git a/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFastFileStorage.php b/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFastFileStorage.php
index c7e6feb..ff19494 100644
--- a/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFastFileStorage.php
+++ b/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFastFileStorage.php
@@ -222,6 +222,7 @@ protected function getUncachedMTime($directory) {
    *   The directory where the temporary filename will be created.
    * @param $prefix
    *   The prefix of the generated temporary filename.
+   *
    * @return string
    *   Returns the new temporary filename (with path), or FALSE on failure.
    */
diff --git a/core/lib/Drupal/Component/Plugin/DependentPluginInterface.php b/core/lib/Drupal/Component/Plugin/DependentPluginInterface.php
index 44d65fc..c86af1b 100644
--- a/core/lib/Drupal/Component/Plugin/DependentPluginInterface.php
+++ b/core/lib/Drupal/Component/Plugin/DependentPluginInterface.php
@@ -20,7 +20,8 @@
    * @return array
    *   An array of dependencies grouped by type (config, content, module,
    *   theme). For example:
-   *   @code
+   *
+     * @code
    *   array(
    *     'config' => array('user.role.anonymous', 'user.role.authenticated'),
    *     'content' => array('node:article:f0a189e6-55fb-47fb-8005-5bef81c44d6d'),
diff --git a/core/lib/Drupal/Component/Plugin/Derivative/DeriverInterface.php b/core/lib/Drupal/Component/Plugin/Derivative/DeriverInterface.php
index 1133bce..5bda143 100644
--- a/core/lib/Drupal/Component/Plugin/Derivative/DeriverInterface.php
+++ b/core/lib/Drupal/Component/Plugin/Derivative/DeriverInterface.php
@@ -32,6 +32,7 @@ public function getDerivativeDefinition($derivative_id, $base_plugin_definition)
    *
    * @param array $base_plugin_definition
    *   The definition array of the base plugin.
+   *
    * @return array
    *   An array of full derivative definitions keyed on derivative id.
    *
diff --git a/core/lib/Drupal/Component/Render/FormattableMarkup.php b/core/lib/Drupal/Component/Render/FormattableMarkup.php
index 6e98928..4549f20 100644
--- a/core/lib/Drupal/Component/Render/FormattableMarkup.php
+++ b/core/lib/Drupal/Component/Render/FormattableMarkup.php
@@ -136,7 +136,8 @@ public function jsonSerialize() {
    *     - A MarkupInterface object cast to a string, the replaced value in the
    *       returned string be forcibly sanitized using
    *       \Drupal\Component\Utility\Html::escape().
-   *       @code
+   *
+         * @code
    *         $this->placeholderFormat('This will force HTML-escaping of the replacement value: @text', ['@text' => (string) $safe_string_interface_object));
    *       @endcode
    *     Use this placeholder as the default choice for anything displayed on
diff --git a/core/lib/Drupal/Component/Utility/Random.php b/core/lib/Drupal/Component/Utility/Random.php
index cf34835..fcba9dd 100644
--- a/core/lib/Drupal/Component/Utility/Random.php
+++ b/core/lib/Drupal/Component/Utility/Random.php
@@ -249,6 +249,7 @@ public function sentences($min_word_count, $capitalize = FALSE) {
    * Generate paragraphs separated by double new line.
    *
    * @param int $paragraph_count
+   *
    * @return string
    */
   public function paragraphs($paragraph_count = 12) {
diff --git a/core/lib/Drupal/Core/Asset/AssetResolver.php b/core/lib/Drupal/Core/Asset/AssetResolver.php
index d90506e..a88294b 100644
--- a/core/lib/Drupal/Core/Asset/AssetResolver.php
+++ b/core/lib/Drupal/Core/Asset/AssetResolver.php
@@ -188,6 +188,7 @@ public function getCssAssets(AttachedAssetsInterface $assets, $optimize) {
    *
    * @param \Drupal\Core\Asset\AttachedAssetsInterface $assets
    *   The assets attached to the current response.
+   *
    * @return array
    *   A (possibly optimized) collection of JavaScript assets.
    */
diff --git a/core/lib/Drupal/Core/Asset/CssOptimizer.php b/core/lib/Drupal/Core/Asset/CssOptimizer.php
index 4ad7ba1..60cbdd1 100644
--- a/core/lib/Drupal/Core/Asset/CssOptimizer.php
+++ b/core/lib/Drupal/Core/Asset/CssOptimizer.php
@@ -146,7 +146,8 @@ public function loadFile($file, $optimize = NULL, $reset_basepath = TRUE) {
    *
    * @param array $matches
    *   An array of matches by a preg_replace_callback() call that scans for
-   *   @import-ed CSS files, except for external CSS files.
+   *
+     * @import-ed CSS files, except for external CSS files.
    *
    * @return
    *   The contents of the CSS file at $matches[1], with corrected paths.
diff --git a/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php b/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php
index 07df709..04d4c4b 100644
--- a/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php
+++ b/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php
@@ -415,7 +415,8 @@ protected function isValidUri($string) {
    *   The containing library definition.
    * @param array $sub_key
    *   An array containing the sub-keys specifying the library asset, e.g.
-   *   @code['js']@endcode or @code['css', 'component']@endcode
+   *
+     * @code['js']@endcode or @code['css', 'component']@endcode
    * @param array $overrides
    *   Specifies the overrides, this is an array where the key is the asset to
    *   be overridden while the value is overriding asset.
diff --git a/core/lib/Drupal/Core/Cache/CacheBackendInterface.php b/core/lib/Drupal/Core/Cache/CacheBackendInterface.php
index 852305f..d138d77 100644
--- a/core/lib/Drupal/Core/Cache/CacheBackendInterface.php
+++ b/core/lib/Drupal/Core/Cache/CacheBackendInterface.php
@@ -103,7 +103,8 @@ public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = []);
    *
    * @param array $items
    *   An array of cache items, keyed by cid. In the form:
-   *   @code
+   *
+     * @code
    *   $items = array(
    *     $cid => array(
    *       // Required, will be automatically serialized if not a string.
diff --git a/core/lib/Drupal/Core/Command/DbCommandBase.php b/core/lib/Drupal/Core/Command/DbCommandBase.php
index ec3b188..d5a80e0 100644
--- a/core/lib/Drupal/Core/Command/DbCommandBase.php
+++ b/core/lib/Drupal/Core/Command/DbCommandBase.php
@@ -26,6 +26,7 @@ protected function configure() {
    *
    * @param \Symfony\Component\Console\Input\InputInterface $input
    *   Input object.
+   *
    * @return \Drupal\Core\Database\Connection
    */
   protected function getDatabaseConnection(InputInterface $input) {
diff --git a/core/lib/Drupal/Core/Command/DbDumpCommand.php b/core/lib/Drupal/Core/Command/DbDumpCommand.php
index aa81af0..ba3e0de 100644
--- a/core/lib/Drupal/Core/Command/DbDumpCommand.php
+++ b/core/lib/Drupal/Core/Command/DbDumpCommand.php
@@ -69,6 +69,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
    *   The database connection to use.
    * @param array $schema_only
    *   Table patterns for which to only dump the schema, no data.
+   *
    * @return string
    *   The PHP script.
    */
@@ -102,6 +103,7 @@ protected function generateScript(Connection $connection, array $schema_only = [
    *
    * @param \Drupal\Core\Database\Connection $connection
    *   The database connection to use.
+   *
    * @return array
    *   An array of table names.
    */
diff --git a/core/lib/Drupal/Core/Config/Config.php b/core/lib/Drupal/Core/Config/Config.php
index 7299d5e..bb186ac 100644
--- a/core/lib/Drupal/Core/Config/Config.php
+++ b/core/lib/Drupal/Core/Config/Config.php
@@ -309,7 +309,8 @@ public function getOriginal($key = '', $apply_overrides = TRUE) {
    * @param string $key
    *   (optional) A string that maps to a key within the configuration data.
    *   For instance in the following configuration array:
-   *   @code
+   *
+     * @code
    *   array(
    *     'foo' => array(
    *       'bar' => 'baz',
diff --git a/core/lib/Drupal/Core/Config/ConfigBase.php b/core/lib/Drupal/Core/Config/ConfigBase.php
index 4f445ea..b2e3d38 100644
--- a/core/lib/Drupal/Core/Config/ConfigBase.php
+++ b/core/lib/Drupal/Core/Config/ConfigBase.php
@@ -114,7 +114,8 @@ public static function validateName($name) {
    * @param string $key
    *   A string that maps to a key within the configuration data.
    *   For instance in the following configuration array:
-   *   @code
+   *
+     * @code
    *   array(
    *     'foo' => array(
    *       'bar' => 'baz',
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
index 237929d..86dede8 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
@@ -355,7 +355,8 @@ public function setData(array $data) {
    *   The configuration dependency name.
    * @param array $dependencies
    *   The configuration dependencies. The array is structured like this:
-   *   @code
+   *
+     * @code
    *   array(
    *     'config' => array(
    *       // An array of configuration entity object names.
diff --git a/core/lib/Drupal/Core/Config/TypedConfigManager.php b/core/lib/Drupal/Core/Config/TypedConfigManager.php
index c6ddfb5..8585f83 100644
--- a/core/lib/Drupal/Core/Config/TypedConfigManager.php
+++ b/core/lib/Drupal/Core/Config/TypedConfigManager.php
@@ -269,6 +269,7 @@ protected function getFallbackName($name) {
    *   Configuration name with variables in square brackets.
    * @param mixed $data
    *   Configuration data for the element.
+   *
    * @return string
    *   Configuration name with variables replaced.
    */
diff --git a/core/lib/Drupal/Core/Database/Connection.php b/core/lib/Drupal/Core/Database/Connection.php
index 100ef68..6c0247b 100644
--- a/core/lib/Drupal/Core/Database/Connection.php
+++ b/core/lib/Drupal/Core/Database/Connection.php
@@ -763,6 +763,7 @@ protected function expandArguments(&$query, &$args) {
    *
    * @param string $class
    *   The class for which we want the potentially driver-specific class.
+   *
    * @return string
    *   The name of the class that should be used for this driver.
    */
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php b/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
index 878607c..9b0ae30 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
@@ -88,6 +88,7 @@ protected function buildTableNameCondition($table_name, $operator = '=', $add_pr
    *   The name of the table to create.
    * @param $table
    *   A Schema API table definition array.
+   *
    * @return
    *   An array of SQL statements to create the table.
    */
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
index e696f24..dca5468 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
@@ -280,6 +280,7 @@ public function escapeTable($table) {
    *
    * @param $string
    *   The string to escape.
+   *
    * @return string
    *   The escaped string.
    */
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
index 96dea95..908e4f4 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
@@ -58,6 +58,7 @@ class Schema extends DatabaseSchema {
    *
    * @param $identifiers
    *   The arguments to build the identifier string
+   *
    * @return
    *   The index/constraint/pkey identifier
    */
@@ -88,6 +89,7 @@ protected function ensureIdentifiersLength($identifier) {
    *
    * @param $table_name
    *   The non-prefixed name of the table.
+   *
    * @return
    *   An object with two member variables:
    *     - 'blob_fields' that lists all the blob fields in the table.
@@ -202,6 +204,7 @@ protected function resetTableInformation($table) {
    *   The non-prefixed name of the table.
    * @param $field
    *   The name of the field.
+   *
    * @return
    *   An array of all the checks for the field.
    */
@@ -240,6 +243,7 @@ public function queryFieldInformation($table, $field) {
    *   The name of the table to create.
    * @param $table
    *   A Schema API table definition array.
+   *
    * @return
    *   An array of SQL statements to create the table.
    */
@@ -921,6 +925,7 @@ public function getComment($table, $column = NULL) {
    *
    * @param $data
    *   String to be hashed.
+   *
    * @return string
    *   A base-64 encoded sha-256 hash, with + and / replaced with _ and any =
    *   padding characters removed.
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
index 8777dda..8ee5dff 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
@@ -49,6 +49,7 @@ public function fieldExists($table, $column) {
    *   The name of the table to create.
    * @param $table
    *   A Schema API table definition array.
+   *
    * @return
    *   An array of SQL statements to create the table.
    */
diff --git a/core/lib/Drupal/Core/Database/Log.php b/core/lib/Drupal/Core/Database/Log.php
index bf142c2..06f6858 100644
--- a/core/lib/Drupal/Core/Database/Log.php
+++ b/core/lib/Drupal/Core/Database/Log.php
@@ -69,6 +69,7 @@ public function start($logging_key) {
    *
    * @param $logging_key
    *   The logging key to fetch.
+   *
    * @return
    *   An indexed array of all query records for this logging key.
    */
diff --git a/core/lib/Drupal/Core/Database/Query/SelectInterface.php b/core/lib/Drupal/Core/Database/Query/SelectInterface.php
index 6a91e72..2b407d8 100644
--- a/core/lib/Drupal/Core/Database/Query/SelectInterface.php
+++ b/core/lib/Drupal/Core/Database/Query/SelectInterface.php
@@ -169,6 +169,7 @@ public function getArguments(PlaceholderInterface $queryPlaceholder = NULL);
    *
    * @param $distinct
    *   TRUE to flag this query DISTINCT, FALSE to disable it.
+   *
    * @return \Drupal\Core\Database\Query\SelectInterface
    *   The called object.
    */
@@ -188,6 +189,7 @@ public function distinct($distinct = TRUE);
    *   automatically based on the $table_alias and $field. The alias will be
    *   checked for uniqueness, so the requested alias may not be the alias
    *   that is assigned in all cases.
+   *
    * @return
    *   The unique alias that was assigned for this field.
    */
@@ -211,6 +213,7 @@ public function addField($table_alias, $field, $alias = NULL);
    *   An indexed array of fields present in the specified table that should be
    *   included in this query. If not specified, $table_alias.* will be generated
    *   without any aliases.
+   *
    * @return \Drupal\Core\Database\Query\SelectInterface
    *   The called object.
    */
@@ -232,6 +235,7 @@ public function fields($table_alias, array $fields = []);
    *   in all cases.
    * @param $arguments
    *   Any placeholder arguments needed for this expression.
+   *
    * @return
    *   The unique alias that was assigned for this expression.
    */
@@ -260,6 +264,7 @@ public function addExpression($expression, $alias = NULL, $arguments = []);
    *   system, for example, when joining the same table more than once.
    * @param $arguments
    *   An array of arguments to replace into the $condition of this join.
+   *
    * @return
    *   The unique alias that was assigned for this table.
    */
@@ -286,6 +291,7 @@ public function join($table, $alias = NULL, $condition = NULL, $arguments = []);
    *   system, for example, when joining the same table more than once.
    * @param $arguments
    *   An array of arguments to replace into the $condition of this join.
+   *
    * @return
    *   The unique alias that was assigned for this table.
    */
@@ -312,6 +318,7 @@ public function innerJoin($table, $alias = NULL, $condition = NULL, $arguments =
    *   system, for example, when joining the same table more than once.
    * @param $arguments
    *   An array of arguments to replace into the $condition of this join.
+   *
    * @return
    *   The unique alias that was assigned for this table.
    */
@@ -338,6 +345,7 @@ public function leftJoin($table, $alias = NULL, $condition = NULL, $arguments =
    *   system, for example, when joining the same table more than once.
    * @param $arguments
    *   An array of arguments to replace into the $condition of this join.
+   *
    * @return
    *   The unique alias that was assigned for this table.
    *
@@ -379,6 +387,7 @@ public function rightJoin($table, $alias = NULL, $condition = NULL, $arguments =
    *   system, for example, when joining the same table more than once.
    * @param $arguments
    *   An array of arguments to replace into the $condition of this join.
+   *
    * @return
    *   The unique alias that was assigned for this table.
    */
@@ -411,6 +420,7 @@ public function addJoin($type, $table, $alias = NULL, $condition = NULL, $argume
    * @param $direction
    *   The direction to sort. Legal values are "ASC" and "DESC". Any other value
    *   will be converted to "ASC".
+   *
    * @return \Drupal\Core\Database\Query\SelectInterface
    *   The called object.
    */
@@ -449,6 +459,7 @@ public function orderRandom();
    *   range directives that are set.
    * @param $length
    *   The number of records to return from the result set.
+   *
    * @return \Drupal\Core\Database\Query\SelectInterface
    *   The called object.
    */
@@ -474,6 +485,7 @@ public function range($start = NULL, $length = NULL);
    * @param $type
    *   The type of UNION to add to the query. Defaults to plain
    *   UNION.
+   *
    * @return \Drupal\Core\Database\Query\SelectInterface
    *   The called object.
    */
@@ -484,6 +496,7 @@ public function union(SelectInterface $query, $type = '');
    *
    * @param $field
    *   The field on which to group. This should be the field as aliased.
+   *
    * @return \Drupal\Core\Database\Query\SelectInterface
    *   The called object.
    */
@@ -539,6 +552,7 @@ public function execute();
    *   The comparison operator, such as =, <, or >=. It also accepts more complex
    *   options such as IN, LIKE, or BETWEEN. Defaults to IN if $value is an array
    *   = otherwise.
+   *
    * @return \Drupal\Core\Database\Query\ConditionInterface
    *   The called object.
    */
diff --git a/core/lib/Drupal/Core/Database/Schema.php b/core/lib/Drupal/Core/Database/Schema.php
index aafe175..6d31e22 100644
--- a/core/lib/Drupal/Core/Database/Schema.php
+++ b/core/lib/Drupal/Core/Database/Schema.php
@@ -452,7 +452,8 @@ public function fieldExists($table, $column) {
    *   second is the maximum length in the index. For example, the following
    *   will use the full length of the `foo` field, but limit the `bar` field to
    *   4 characters:
-   *   @code
+   *
+     * @code
    *     $fields = ['foo', ['bar', 4]];
    *   @endcode
    * @param array $spec
@@ -468,7 +469,8 @@ public function fieldExists($table, $column) {
    *   complete table specification. However, in the edge case of the complete
    *   table specification not being available, we can pass in a partial table
    *   definition containing only the fields that apply to the index:
-   *   @code
+   *
+     * @code
    *   $spec = [
    *     // Example partial specification for a table:
    *     'fields' => [
diff --git a/core/lib/Drupal/Core/Database/StatementPrefetch.php b/core/lib/Drupal/Core/Database/StatementPrefetch.php
index 4e940ea..03f315c 100644
--- a/core/lib/Drupal/Core/Database/StatementPrefetch.php
+++ b/core/lib/Drupal/Core/Database/StatementPrefetch.php
@@ -216,6 +216,7 @@ protected function throwPDOException() {
    *   The query.
    * @param array $args
    *   An array of arguments.
+   *
    * @return \PDOStatement
    *   A PDOStatement object.
    */
diff --git a/core/lib/Drupal/Core/Datetime/DrupalDateTime.php b/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
index f921b45..e949912 100644
--- a/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
+++ b/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
@@ -38,7 +38,8 @@ class DrupalDateTime extends DateTimePlus {
    *   timezone are ignored when the $time parameter either is a UNIX timestamp
    *   (e.g. @946684800) or specifies a timezone
    *   (e.g. 2010-01-28T15:00:00+02:00).
-   *   @see http://php.net/manual/datetime.construct.php
+   *
+     * @see http://php.net/manual/datetime.construct.php
    * @param array $settings
    *   - validate_format: (optional) Boolean choice to validate the
    *     created date using the input format. The format used in
diff --git a/core/lib/Drupal/Core/Entity/DependencyTrait.php b/core/lib/Drupal/Core/Entity/DependencyTrait.php
index 81112eb..e800a2e 100644
--- a/core/lib/Drupal/Core/Entity/DependencyTrait.php
+++ b/core/lib/Drupal/Core/Entity/DependencyTrait.php
@@ -49,7 +49,8 @@ protected function addDependency($type, $name) {
    *
    * @param array $dependencies
    *   An array of dependencies keyed by the type of dependency. One example:
-   *   @code
+   *
+     * @code
    *   array(
    *     'module' => array(
    *       'node',
diff --git a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
index 34ce858..f286a0c 100644
--- a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
@@ -441,6 +441,7 @@ protected function getFieldDefinitions() {
    *
    * @param \Drupal\Core\Field\FieldDefinitionInterface $definition
    *   A field definition.
+   *
    * @return array|null
    */
   private function fieldHasDisplayOptions(FieldDefinitionInterface $definition) {
diff --git a/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php b/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php
index 2265cd0..5651c7f 100644
--- a/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php
@@ -23,7 +23,8 @@
    * @param string $operation
    *   (optional) The operation identifying the form variation to be returned.
    *   Defaults to 'default'. This is typically used in routing:
-   *   @code
+   *
+     * @code
    *   _entity_form: node.book_outline
    *   @endcode
    *   where "book_outline" is the value of $operation. The class name for the
diff --git a/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php b/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php
index 875b8c2..95b8dc0 100644
--- a/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php
@@ -26,6 +26,7 @@ public function getConjunction();
    *
    * @return \Drupal\Core\Entity\Query\ConditionAggregateInterface
    *   The called object.
+   *
    * @see \Drupal\Core\Entity\Query\QueryInterface::condition()
    */
   public function condition($field, $function = NULL, $value = NULL, $operator = NULL, $langcode = NULL);
@@ -35,7 +36,9 @@ public function condition($field, $function = NULL, $value = NULL, $operator = N
    *
    * @param $field
    * @param string $langcode
+   *
    * @return ConditionInterface
+   *
    * @see \Drupal\Core\Entity\Query\QueryInterface::exists()
    */
   public function exists($field, $function, $langcode = NULL);
@@ -44,7 +47,9 @@ public function exists($field, $function, $langcode = NULL);
    * Queries for the nonexistence of a field.
    *
    * @param string $field
+   *
    * @return ConditionInterface
+   *
    * @see \Drupal\Core\Entity\Query\QueryInterface::notexists()
    */
   public function notExists($field, $function, $langcode = NULL);
diff --git a/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php b/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php
index d42e48f..2718f60 100644
--- a/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php
@@ -31,7 +31,9 @@ public function count();
    * @param mixed $value
    * @param string $operator
    * @param string $langcode
+   *
    * @return ConditionInterface
+   *
    * @see \Drupal\Core\Entity\Query\QueryInterface::condition()
    */
   public function condition($field, $value = NULL, $operator = NULL, $langcode = NULL);
@@ -41,7 +43,9 @@ public function condition($field, $value = NULL, $operator = NULL, $langcode = N
    *
    * @param $field
    * @param string $langcode
+   *
    * @return ConditionInterface
+   *
    * @see \Drupal\Core\Entity\Query\QueryInterface::exists()
    */
   public function exists($field, $langcode = NULL);
@@ -50,7 +54,9 @@ public function exists($field, $langcode = NULL);
    * Queries for the existence of a field.
    *
    * @param string $field
+   *
    * @return ConditionInterface
+   *
    * @see \Drupal\Core\Entity\Query\QueryInterface::notexists()
    */
   public function notExists($field, $langcode = NULL);
diff --git a/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php b/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php
index 3c94ba7..1245502 100644
--- a/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php
@@ -135,6 +135,7 @@ public function sortAggregate($field, $function, $direction = 'ASC', $langcode =
    * @return array
    *   A list of result row arrays. Each result row contains the aggregate
    *   results as keys and also the groupBy columns as keys:
+   *
    * @code
    * $result = $query
    *   ->aggregate('nid', 'count')
diff --git a/core/lib/Drupal/Core/Entity/Query/QueryInterface.php b/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
index d4b0608..cca9e4e 100644
--- a/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
@@ -52,7 +52,8 @@ public function getEntityTypeId();
    *   same delta within that field. In order to limit the condition to a
    *   specific item a numeric delta should be added between the field name and
    *   the column name.
-   *   @code
+   *
+     * @code
    *   ->condition('tags.5.value', 'news')
    *   @endcode
    *   This will require condition to be satisfied on a specific delta of the
@@ -95,6 +96,7 @@ public function getEntityTypeId();
    *   translation.
    *
    * @return \Drupal\Core\Entity\Query\QueryInterface
+   *
    * @see \Drupal\Core\Entity\Query\andConditionGroup
    * @see \Drupal\Core\Entity\Query\orConditionGroup
    */
@@ -107,6 +109,7 @@ public function condition($field, $value = NULL, $operator = NULL, $langcode = N
    *   Name of a field.
    * @param $langcode
    *   Language code (optional).
+   *
    * @return \Drupal\Core\Entity\Query\QueryInterface
    */
   public function exists($field, $langcode = NULL);
@@ -118,6 +121,7 @@ public function exists($field, $langcode = NULL);
    *   Name of a field.
    * @param $langcode
    *   Language code (optional).
+   *
    * @return \Drupal\Core\Entity\Query\QueryInterface
    */
   public function notExists($field, $langcode = NULL);
diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php b/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
index c791bb5..318c0c4 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
@@ -146,6 +146,7 @@ protected function finish() {
    *   The field as passed in by the caller.
    * @param string $sql_field
    *   The sql field as returned by getSqlField.
+   *
    * @return string
    *   The SQL alias expected in the return value. The dots in $sql_field are
    *   replaced with underscores and if a default fallback to .value happened,
diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
index 0c54dc4..502297d 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
@@ -353,7 +353,9 @@ protected function ensureEntityTable($index_prefix, $property, $type, $langcode,
    *
    * @param $field_name
    *   Name of the field.
+   *
    * @return string
+   *
    * @throws \Drupal\Core\Entity\Query\QueryException
    */
   protected function ensureFieldTable($index_prefix, &$field, $type, $langcode, $base_table, $entity_id_field, $field_id_field, $delta) {
diff --git a/core/lib/Drupal/Core/Field/FieldItemInterface.php b/core/lib/Drupal/Core/Field/FieldItemInterface.php
index f23395c..e70b6db 100644
--- a/core/lib/Drupal/Core/Field/FieldItemInterface.php
+++ b/core/lib/Drupal/Core/Field/FieldItemInterface.php
@@ -399,7 +399,8 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state);
    * @return array
    *   An array of dependencies grouped by type (config, content, module,
    *   theme). For example:
-   *   @code
+   *
+     * @code
    *   array(
    *     'config' => array('user.role.anonymous', 'user.role.authenticated'),
    *     'content' => array('node:article:f0a189e6-55fb-47fb-8005-5bef81c44d6d'),
@@ -432,7 +433,8 @@ public static function calculateDependencies(FieldDefinitionInterface $field_def
    * @return array
    *   An array of dependencies grouped by type (config, content, module,
    *   theme). For example:
-   *   @code
+   *
+     * @code
    *   [
    *     'config' => ['user.role.anonymous', 'user.role.authenticated'],
    *     'content' => ['node:article:f0a189e6-55fb-47fb-8005-5bef81c44d6d'],
diff --git a/core/lib/Drupal/Core/File/file.api.php b/core/lib/Drupal/Core/File/file.api.php
index 506884f..ba68cb5 100644
--- a/core/lib/Drupal/Core/File/file.api.php
+++ b/core/lib/Drupal/Core/File/file.api.php
@@ -20,6 +20,7 @@
  *
  * @param $uri
  *   The URI of the file.
+ *
  * @return
  *   If the user does not have permission to access the file, return -1. If the
  *   user has permission, return an array with the appropriate headers. If the
diff --git a/core/lib/Drupal/Core/Form/FormBuilderInterface.php b/core/lib/Drupal/Core/Form/FormBuilderInterface.php
index ca79437..4cb08ec 100644
--- a/core/lib/Drupal/Core/Form/FormBuilderInterface.php
+++ b/core/lib/Drupal/Core/Form/FormBuilderInterface.php
@@ -157,7 +157,8 @@ public function rebuildForm($form_id, FormStateInterface &$form_state, $old_form
    *   should not be included here, but rather placed directly in the
    *   $form_state build info array so that the reference can be preserved. For
    *   example, a form builder function with the following signature:
-   *   @code
+   *
+     * @code
    *   function mymodule_form($form, FormStateInterface &$form_state, &$object) {
    *   }
    *   @endcode
diff --git a/core/lib/Drupal/Core/Form/form.api.php b/core/lib/Drupal/Core/Form/form.api.php
index 554e271..d2d9eb0 100644
--- a/core/lib/Drupal/Core/Form/form.api.php
+++ b/core/lib/Drupal/Core/Form/form.api.php
@@ -37,7 +37,8 @@
  *     is not initially set when this callback is first called, which makes it
  *     useful for determining whether it is the first call of the callback or
  *     not:
- *     @code
+ *
+     * @code
  *       if (empty($context['sandbox'])) {
  *         // Perform set-up steps here.
  *       }
diff --git a/core/lib/Drupal/Core/Image/ImageInterface.php b/core/lib/Drupal/Core/Image/ImageInterface.php
index 29d092a..d1584ab 100644
--- a/core/lib/Drupal/Core/Image/ImageInterface.php
+++ b/core/lib/Drupal/Core/Image/ImageInterface.php
@@ -83,7 +83,8 @@ public function getToolkitId();
    * @param array $arguments
    *   (optional) An associative array of arguments to be passed to the toolkit
    *   operation; for instance,
-   *   @code
+   *
+     * @code
    *     ['width' => 50, 'height' => 100, 'upscale' => TRUE]
    *   @endcode
    *   Defaults to an empty array.
diff --git a/core/lib/Drupal/Core/Mail/MailInterface.php b/core/lib/Drupal/Core/Mail/MailInterface.php
index fbde1b8..bb1cb13 100644
--- a/core/lib/Drupal/Core/Mail/MailInterface.php
+++ b/core/lib/Drupal/Core/Mail/MailInterface.php
@@ -41,7 +41,8 @@ public function format(array $message);
    *     'user_password_reset'.
    *   - to: The mail address or addresses where the message will be sent to.
    *     The formatting of this string will be validated with the
-   *     @link http://php.net/manual/filter.filters.validate.php PHP email validation filter. @endlink
+   *
+       * @link http://php.net/manual/filter.filters.validate.php PHP email validation filter. @endlink
    *     Some examples:
    *     - user@example.com
    *     - user@example.com, anotheruser@example.com
diff --git a/core/lib/Drupal/Core/Mail/MailManager.php b/core/lib/Drupal/Core/Mail/MailManager.php
index 348dcee..a73d8c8 100644
--- a/core/lib/Drupal/Core/Mail/MailManager.php
+++ b/core/lib/Drupal/Core/Mail/MailManager.php
@@ -188,7 +188,8 @@ public function mail($module, $key, $to, $langcode, $params = [], $reply = NULL,
    * @param string $to
    *   The email address or addresses where the message will be sent to. The
    *   formatting of this string will be validated with the
-   *   @link http://php.net/manual/filter.filters.validate.php PHP email validation filter. @endlink
+   *
+     * @link http://php.net/manual/filter.filters.validate.php PHP email validation filter. @endlink
    *   Some examples are:
    *   - user@example.com
    *   - user@example.com, anotheruser@example.com
diff --git a/core/lib/Drupal/Core/Mail/MailManagerInterface.php b/core/lib/Drupal/Core/Mail/MailManagerInterface.php
index 0228fbc..4477901 100644
--- a/core/lib/Drupal/Core/Mail/MailManagerInterface.php
+++ b/core/lib/Drupal/Core/Mail/MailManagerInterface.php
@@ -93,7 +93,8 @@
    * @param string $to
    *   The email address or addresses where the message will be sent to. The
    *   formatting of this string will be validated with the
-   *   @link http://php.net/manual/filter.filters.validate.php PHP email validation filter. @endlink
+   *
+     * @link http://php.net/manual/filter.filters.validate.php PHP email validation filter. @endlink
    *   Some examples are:
    *   - user@example.com
    *   - user@example.com, anotheruser@example.com
diff --git a/core/lib/Drupal/Core/Menu/MenuTreeStorage.php b/core/lib/Drupal/Core/Menu/MenuTreeStorage.php
index f6578fe..c4feb5b 100644
--- a/core/lib/Drupal/Core/Menu/MenuTreeStorage.php
+++ b/core/lib/Drupal/Core/Menu/MenuTreeStorage.php
@@ -1463,6 +1463,7 @@ protected static function schemaDefinition() {
    *
    * @param array $definitions
    *   The new menu link definitions.
+   *
    * @return array
    *   A list of menu link IDs that no longer exist.
    */
diff --git a/core/lib/Drupal/Core/Menu/MenuTreeStorageInterface.php b/core/lib/Drupal/Core/Menu/MenuTreeStorageInterface.php
index 0e36e13..22da681 100644
--- a/core/lib/Drupal/Core/Menu/MenuTreeStorageInterface.php
+++ b/core/lib/Drupal/Core/Menu/MenuTreeStorageInterface.php
@@ -137,7 +137,8 @@ public function delete($id);
    * @return array
    *   An array with 2 elements:
    *   - tree: A fully built menu tree containing an array.
-   *     @see static::treeDataRecursive()
+   *
+       * @see static::treeDataRecursive()
    *   - route_names: An array of all route names used in the tree.
    */
   public function loadTreeData($menu_name, MenuTreeParameters $parameters);
@@ -200,6 +201,7 @@ public function loadSubtreeData($id, $max_relative_depth = NULL);
    *   exists, the returned array will at least include it.  An empty array is
    *   returned if the ID does not exist in the storage. An example $id (8) with
    *   two parents (1, 6) looks like the following:
+   *
    * @code
    *   array(
    *     'p1' => 1,
diff --git a/core/lib/Drupal/Core/Menu/menu.api.php b/core/lib/Drupal/Core/Menu/menu.api.php
index f932cf9..9c5feef 100644
--- a/core/lib/Drupal/Core/Menu/menu.api.php
+++ b/core/lib/Drupal/Core/Menu/menu.api.php
@@ -378,7 +378,8 @@ function hook_local_tasks_alter(&$local_tasks) {
  * @param array $route_parameters
  *   The route parameters passed to each route_name of the contextual links.
  *   For example:
- *   @code
+ *
+   * @code
  *   array('node' => $node->id())
  *   @endcode
  *
@@ -447,7 +448,8 @@ function hook_system_breadcrumb_alter(\Drupal\Core\Breadcrumb\Breadcrumb &$bread
  *   - text: The link text for the anchor tag. If the hook implementation
  *     changes this text it needs to preserve the safeness of the original text.
  *     Using t() or \Drupal\Component\Utility\SafeMarkup::format() with
- *     @placeholder is recommended as this will escape the original text if
+ *
+     * @placeholder is recommended as this will escape the original text if
  *     necessary. If the resulting text is not marked safe it will be escaped.
  *   - url_is_active: Whether or not the link points to the currently active
  *     URL.
diff --git a/core/lib/Drupal/Core/Plugin/Context/ContextRepositoryInterface.php b/core/lib/Drupal/Core/Plugin/Context/ContextRepositoryInterface.php
index dca4acc..9a5692e 100644
--- a/core/lib/Drupal/Core/Plugin/Context/ContextRepositoryInterface.php
+++ b/core/lib/Drupal/Core/Plugin/Context/ContextRepositoryInterface.php
@@ -22,7 +22,8 @@
    *
    * @param string[] $context_ids
    *   Fully qualified context IDs, which looks like
-   *   @{service_id}:{unqualified_context_id}, so for example
+   *
+     * @{service_id}:{unqualified_context_id}, so for example
    *   node.node_route_context:node.
    *
    * @return \Drupal\Core\Plugin\Context\ContextInterface[]
diff --git a/core/lib/Drupal/Core/Render/Element/Tableselect.php b/core/lib/Drupal/Core/Render/Element/Tableselect.php
index 24eb431..7759ca3 100644
--- a/core/lib/Drupal/Core/Render/Element/Tableselect.php
+++ b/core/lib/Drupal/Core/Render/Element/Tableselect.php
@@ -115,7 +115,8 @@ public static function valueCallback(&$element, $input, FormStateInterface $form
    *   properties can include #attributes, which is added to the
    *   table row's HTML attributes; see table.html.twig. An example of per-row
    *   options:
-   *   @code
+   *
+     * @code
    *     $options = array(
    *       array(
    *         'title' => $this->t('How to Learn Drupal'),
diff --git a/core/lib/Drupal/Core/Render/theme.api.php b/core/lib/Drupal/Core/Render/theme.api.php
index 754641c..07dddf7 100644
--- a/core/lib/Drupal/Core/Render/theme.api.php
+++ b/core/lib/Drupal/Core/Render/theme.api.php
@@ -1153,7 +1153,8 @@ function hook_page_bottom(array &$page_bottom) {
  *     differentiate the dynamic portion of the theme. For example, to allow
  *     forums to be themed individually, the pattern might be: 'forum__'. Then,
  *     when the forum is rendered, following render array can be used:
- *     @code
+ *
+     * @code
  *     $render_array = array(
  *       '#theme' => array('forum__' . $tid, 'forum'),
  *       '#forum' => $forum,
diff --git a/core/lib/Drupal/Core/Session/SessionManager.php b/core/lib/Drupal/Core/Session/SessionManager.php
index 6071031..b1ad185 100644
--- a/core/lib/Drupal/Core/Session/SessionManager.php
+++ b/core/lib/Drupal/Core/Session/SessionManager.php
@@ -80,7 +80,8 @@ class SessionManager extends NativeSessionStorage implements SessionManagerInter
    *   The session configuration interface.
    * @param \Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy|Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler|\SessionHandlerInterface|null $handler
    *   The object to register as a PHP session handler.
-   *   @see \Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage::setSaveHandler()
+   *
+     * @see \Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage::setSaveHandler()
    */
   public function __construct(RequestStack $request_stack, Connection $connection, MetadataBag $metadata_bag, SessionConfigurationInterface $session_configuration, $handler = NULL) {
     $options = [];
diff --git a/core/lib/Drupal/Core/StringTranslation/StringTranslationTrait.php b/core/lib/Drupal/Core/StringTranslation/StringTranslationTrait.php
index c435f79..96a01e9 100644
--- a/core/lib/Drupal/Core/StringTranslation/StringTranslationTrait.php
+++ b/core/lib/Drupal/Core/StringTranslation/StringTranslationTrait.php
@@ -56,7 +56,8 @@
    *     translate to a language other than what is used to display the page.
    *   - 'context' (defaults to the empty context): The context the source
    *     string belongs to. See the
-   *     @link i18n Internationalization topic @endlink for more information
+   *
+       * @link i18n Internationalization topic @endlink for more information
    *     about string contexts.
    *
    * @return \Drupal\Core\StringTranslation\TranslatableMarkup
diff --git a/core/lib/Drupal/Core/StringTranslation/TranslationInterface.php b/core/lib/Drupal/Core/StringTranslation/TranslationInterface.php
index 6a977b4..40acbd9 100644
--- a/core/lib/Drupal/Core/StringTranslation/TranslationInterface.php
+++ b/core/lib/Drupal/Core/StringTranslation/TranslationInterface.php
@@ -34,7 +34,8 @@
    *     translate to a language other than what is used to display the page.
    *   - 'context' (defaults to the empty context): The context the source
    *     string belongs to. See the
-   *     @link i18n Internationalization topic @endlink for more information
+   *
+       * @link i18n Internationalization topic @endlink for more information
    *     about string contexts.
    *
    * @return \Drupal\Core\StringTranslation\TranslatableMarkup
diff --git a/core/lib/Drupal/Core/Theme/Registry.php b/core/lib/Drupal/Core/Theme/Registry.php
index 7cf4b3c..4e6cd18 100644
--- a/core/lib/Drupal/Core/Theme/Registry.php
+++ b/core/lib/Drupal/Core/Theme/Registry.php
@@ -794,6 +794,7 @@ public function destruct() {
    *
    * @param $prefixes
    *   An array of function prefixes by which the list can be limited.
+   *
    * @return array
    *   Functions grouped by the first prefix.
    */
diff --git a/core/lib/Drupal/Core/Theme/ThemeManagerInterface.php b/core/lib/Drupal/Core/Theme/ThemeManagerInterface.php
index 2af8074..9279213 100644
--- a/core/lib/Drupal/Core/Theme/ThemeManagerInterface.php
+++ b/core/lib/Drupal/Core/Theme/ThemeManagerInterface.php
@@ -58,6 +58,7 @@ public function resetActiveTheme();
    *
    * @param \Drupal\Core\Theme\ActiveTheme $active_theme
    *   The new active theme.
+   *
    * @return $this
    */
   public function setActiveTheme(ActiveTheme $active_theme);
diff --git a/core/lib/Drupal/Core/Url.php b/core/lib/Drupal/Core/Url.php
index 76dc46c..139f602 100644
--- a/core/lib/Drupal/Core/Url.php
+++ b/core/lib/Drupal/Core/Url.php
@@ -182,7 +182,8 @@ public static function fromRouteMatch(RouteMatchInterface $route_match) {
    *   to search for existing resources, but also may type one of these
    *   characters to link to (e.g.) a specific path on the site.
    *   (With regard to the URI specification, the user input is treated as a
-   *   @link https://tools.ietf.org/html/rfc3986#section-4.2 relative URI reference @endlink
+   *
+     * @link https://tools.ietf.org/html/rfc3986#section-4.2 relative URI reference @endlink
    *   where the relative part is of type
    *   @link https://tools.ietf.org/html/rfc3986#section-3.3 path-abempty @endlink.)
    * @param array $options
diff --git a/core/lib/Drupal/Core/Utility/Token.php b/core/lib/Drupal/Core/Utility/Token.php
index a250d58..a414df6 100644
--- a/core/lib/Drupal/Core/Utility/Token.php
+++ b/core/lib/Drupal/Core/Utility/Token.php
@@ -163,7 +163,8 @@ public function __construct(ModuleHandlerInterface $module_handler, CacheBackend
    *   attached to the same render array that contains the token-replaced text,
    *   callers of this method are encouraged to pass in a BubbleableMetadata
    *   object and apply it to the corresponding render array. For example:
-   *   @code
+   *
+     * @code
    *     $bubbleable_metadata = new BubbleableMetadata();
    *     $build['#markup'] = $token_service->replace('Tokens: [node:nid] [current-user:uid]', ['node' => $node], [], $bubbleable_metadata);
    *     $bubbleable_metadata->applyTo($build);
diff --git a/core/lib/Drupal/Core/Utility/token.api.php b/core/lib/Drupal/Core/Utility/token.api.php
index 5916752..4579982 100644
--- a/core/lib/Drupal/Core/Utility/token.api.php
+++ b/core/lib/Drupal/Core/Utility/token.api.php
@@ -48,7 +48,8 @@
  *   'system.site') and related objects (e.g., $node->getOwner()),
  *   implementations of this hook must add the corresponding metadata.
  *   For example:
- *   @code
+ *
+   * @code
  *     $bubbleable_metadata->addCacheableDependency(\Drupal::config('system.site'));
  *     $bubbleable_metadata->addCacheableDependency($node->getOwner());
  *   @endcode
diff --git a/core/modules/block/tests/src/Traits/BlockCreationTrait.php b/core/modules/block/tests/src/Traits/BlockCreationTrait.php
index fe0a379..a7a9df5 100644
--- a/core/modules/block/tests/src/Traits/BlockCreationTrait.php
+++ b/core/modules/block/tests/src/Traits/BlockCreationTrait.php
@@ -20,7 +20,8 @@
    *   (optional) An associative array of settings for the block entity.
    *   Override the defaults by specifying the key and value in the array, for
    *   example:
-   *   @code
+   *
+     * @code
    *     $this->drupalPlaceBlock('system_powered_by_block', array(
    *       'label' => t('Hello, world!'),
    *     ));
diff --git a/core/modules/ckeditor/src/CKEditorPluginInterface.php b/core/modules/ckeditor/src/CKEditorPluginInterface.php
index 543a112..c54b461 100644
--- a/core/modules/ckeditor/src/CKEditorPluginInterface.php
+++ b/core/modules/ckeditor/src/CKEditorPluginInterface.php
@@ -45,6 +45,7 @@ public function isInternal();
    *
    * @param \Drupal\editor\Entity\Editor $editor
    *   A configured text editor object.
+   *
    * @return array
    *   An unindexed array of plugin names this plugin requires. Each plugin is
    *   is identified by its annotated ID.
@@ -59,6 +60,7 @@ public function getDependencies(Editor $editor);
    *
    * @param \Drupal\editor\Entity\Editor $editor
    *   A configured text editor object.
+   *
    * @return array
    *   An array of libraries suitable for usage in a render API #attached
    *   property.
@@ -91,6 +93,7 @@ public function getFile();
    *
    * @param \Drupal\editor\Entity\Editor $editor
    *   A configured text editor object.
+   *
    * @return array
    *   A keyed array, whose keys will end up as keys under CKEDITOR.config.
    */
diff --git a/core/modules/ckeditor/src/CKEditorPluginManager.php b/core/modules/ckeditor/src/CKEditorPluginManager.php
index 735cfa6..47fa80b 100644
--- a/core/modules/ckeditor/src/CKEditorPluginManager.php
+++ b/core/modules/ckeditor/src/CKEditorPluginManager.php
@@ -60,6 +60,7 @@ public function __construct(\Traversable $namespaces, CacheBackendInterface $cac
    * @param bool $include_internal_plugins
    *   Defaults to FALSE. When set to TRUE, plugins whose isInternal() method
    *   returns TRUE will also be included.
+   *
    * @return array
    *   A list of the enabled CKEditor plugins, with the plugin IDs as keys and
    *   the Drupal root-relative plugin files as values.
diff --git a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php
index 2f14bca..6e41afb 100644
--- a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php
+++ b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php
@@ -117,6 +117,7 @@ public function validateStylesValue(array $element, FormStateInterface $form_sta
    *
    * @param string $styles
    *   The "styles" setting.
+   *
    * @return array|false
    *   An array containing the "stylesSet" configuration, or FALSE when the
    *   syntax is invalid.
diff --git a/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php b/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php
index 49ab1b3..33181e1 100644
--- a/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php
+++ b/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php
@@ -385,6 +385,7 @@ public function getLibraries(Editor $editor) {
    *
    * @param \Drupal\editor\Entity\Editor $editor
    *   A configured text editor object.
+   *
    * @return array
    *   An array containing the "toolbar" configuration.
    */
@@ -408,6 +409,7 @@ public function buildToolbarJSSetting(Editor $editor) {
    *
    * @param \Drupal\editor\Entity\Editor $editor
    *   A configured text editor object.
+   *
    * @return array
    *   An array containing the "contentsCss" configuration.
    */
diff --git a/core/modules/comment/src/CommentStorageInterface.php b/core/modules/comment/src/CommentStorageInterface.php
index accc9de..592b1ea 100644
--- a/core/modules/comment/src/CommentStorageInterface.php
+++ b/core/modules/comment/src/CommentStorageInterface.php
@@ -75,6 +75,7 @@ public function getDisplayOrdinal(CommentInterface $comment, $comment_mode, $div
    *
    * @param \Drupal\comment\CommentInterface[] $comments
    *   An array of comment entities keyed by their ids.
+   *
    * @return array
    *   The entity ids of the passed comment entities' children as an array.
    */
diff --git a/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php b/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php
index b2511c5..09fd0a5 100644
--- a/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php
+++ b/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php
@@ -43,8 +43,10 @@ public function prepareRow(Row $row) {
    *
    * @param \Drupal\migrate\Row $row
    *   The row from the source to process.
+   *
    * @return \Drupal\migrate\Row
    *   The row object.
+   *
    * @deprecated in Drupal 8.4.x, to be removed before Drupal 9.0.x.
    */
   protected function prepareComment(Row $row) {
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationInstallTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationInstallTest.php
index 2c8aabc..524238f 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationInstallTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationInstallTest.php
@@ -39,6 +39,7 @@ protected function setUpLanguage() {
    *
    * @param string $langcode
    *   The language code.
+   *
    * @return string
    *   Contents for the test .po file.
    */
diff --git a/core/modules/content_translation/src/Controller/ContentTranslationController.php b/core/modules/content_translation/src/Controller/ContentTranslationController.php
index 190778d..2d864ce 100644
--- a/core/modules/content_translation/src/Controller/ContentTranslationController.php
+++ b/core/modules/content_translation/src/Controller/ContentTranslationController.php
@@ -77,6 +77,7 @@ public function prepareTranslation(ContentEntityInterface $entity, LanguageInter
    *   The route match.
    * @param string $entity_type_id
    *   (optional) The entity type ID.
+   *
    * @return array
    *   Array of page elements to render.
    */
diff --git a/core/modules/contextual/src/Element/ContextualLinks.php b/core/modules/contextual/src/Element/ContextualLinks.php
index e5b58fb..da05779 100644
--- a/core/modules/contextual/src/Element/ContextualLinks.php
+++ b/core/modules/contextual/src/Element/ContextualLinks.php
@@ -44,7 +44,8 @@ public function getInfo() {
    *   the following keys:
    *   - route_parameters: The route parameters passed to the url generator.
    *   - metadata: Any additional data needed in order to alter the link.
-   *   @code
+   *
+     * @code
    *     array('#contextual_links' => array(
    *       'block' => array(
    *         'route_parameters' => array('block' => 'system.menu-tools'),
diff --git a/core/modules/field/src/Tests/FieldTestBase.php b/core/modules/field/src/Tests/FieldTestBase.php
index a610757..3c12eec 100644
--- a/core/modules/field/src/Tests/FieldTestBase.php
+++ b/core/modules/field/src/Tests/FieldTestBase.php
@@ -19,6 +19,7 @@
    *
    * @param $cardinality
    *   Number of values to generate.
+   *
    * @return
    *   An array of random values, in the format expected for field values.
    */
diff --git a/core/modules/field/tests/modules/field_test/field_test.module b/core/modules/field/tests/modules/field_test/field_test.module
index 9121e94..bff5520 100644
--- a/core/modules/field/tests/modules/field_test/field_test.module
+++ b/core/modules/field/tests/modules/field_test/field_test.module
@@ -57,6 +57,7 @@
  *   The key under which to store to $value, or NULL as described above.
  * @param $value
  *   A value to store for $key.
+ *
  * @return
  *   An array mapping each $key to an array of each $value passed in
  *   for that key.
diff --git a/core/modules/field/tests/src/Functional/FieldTestBase.php b/core/modules/field/tests/src/Functional/FieldTestBase.php
index b8dff1e..4f6913e 100644
--- a/core/modules/field/tests/src/Functional/FieldTestBase.php
+++ b/core/modules/field/tests/src/Functional/FieldTestBase.php
@@ -16,6 +16,7 @@
    *
    * @param $cardinality
    *   Number of values to generate.
+   *
    * @return
    *   An array of random values, in the format expected for field values.
    */
diff --git a/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php b/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
index 96e77cf..42e0465 100644
--- a/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
+++ b/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
@@ -155,6 +155,7 @@ protected function entityValidateAndSave(EntityInterface $entity) {
    *
    * @param $cardinality
    *   Number of values to generate.
+   *
    * @return
    *   An array of random values, in the format expected for field values.
    */
diff --git a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
index 06eed1f..f81b104 100644
--- a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
+++ b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
@@ -75,7 +75,8 @@ public function getEntityFromRouteMatch(RouteMatchInterface $route_match, $entit
    *
    * @return array
    *   Example usage:
-   *   @code
+   *
+     * @code
    *     return array(
    *       'content' => array(
    *         // label for the region.
diff --git a/core/modules/field_ui/src/Tests/ManageDisplayTest.php b/core/modules/field_ui/src/Tests/ManageDisplayTest.php
index 688b9e9..d47a907 100644
--- a/core/modules/field_ui/src/Tests/ManageDisplayTest.php
+++ b/core/modules/field_ui/src/Tests/ManageDisplayTest.php
@@ -479,6 +479,7 @@ public function assertNodeViewText(EntityInterface $node, $view_mode, $text, $me
    *   Plain text to look for.
    * @param $message
    *   Message to display.
+   *
    * @return
    *   TRUE on pass, FALSE on fail.
    */
diff --git a/core/modules/file/file.api.php b/core/modules/file/file.api.php
index 1fda717..7ba8f60 100644
--- a/core/modules/file/file.api.php
+++ b/core/modules/file/file.api.php
@@ -18,6 +18,7 @@
  *
  * @param \Drupal\file\FileInterface $file
  *   The file entity being validated.
+ *
  * @return array
  *   An array of error messages. If there are no problems with the file return
  *   an empty array.
diff --git a/core/modules/file/src/Tests/FileListingTest.php b/core/modules/file/src/Tests/FileListingTest.php
index 5c8b834..9358121 100644
--- a/core/modules/file/src/Tests/FileListingTest.php
+++ b/core/modules/file/src/Tests/FileListingTest.php
@@ -45,6 +45,7 @@ protected function setUp() {
    *
    * @param $usage array
    *   Array of file usage information as returned from file_usage subsystem.
+   *
    * @return int
    *   Total usage count.
    */
diff --git a/core/modules/file/src/Tests/FileManagedTestBase.php b/core/modules/file/src/Tests/FileManagedTestBase.php
index 879e1c4..a7061cc 100644
--- a/core/modules/file/src/Tests/FileManagedTestBase.php
+++ b/core/modules/file/src/Tests/FileManagedTestBase.php
@@ -145,6 +145,7 @@ public function assertSameFile(FileInterface $file1, FileInterface $file2) {
    * @param string $scheme
    *   Optional string indicating the stream scheme to use. Drupal core includes
    *   public, private, and temporary. The public wrapper is the default.
+   *
    * @return \Drupal\file\FileInterface
    *   File entity.
    */
diff --git a/core/modules/file/tests/file_test/file_test.module b/core/modules/file/tests/file_test/file_test.module
index 0baa0cb..e88e521 100644
--- a/core/modules/file/tests/file_test/file_test.module
+++ b/core/modules/file/tests/file_test/file_test.module
@@ -319,6 +319,7 @@ function file_test_validator(File $file, $errors) {
  *
  * @param string|null $filepath
  *   File path
+ *
  * @return array
  *   If $filepath is NULL, an array of all previous $filepath parameters
  */
diff --git a/core/modules/file/tests/src/Functional/FileManagedTestBase.php b/core/modules/file/tests/src/Functional/FileManagedTestBase.php
index e0da7d1..e1771a9 100644
--- a/core/modules/file/tests/src/Functional/FileManagedTestBase.php
+++ b/core/modules/file/tests/src/Functional/FileManagedTestBase.php
@@ -142,6 +142,7 @@ public function assertSameFile(FileInterface $file1, FileInterface $file2) {
    * @param string $scheme
    *   Optional string indicating the stream scheme to use. Drupal core includes
    *   public, private, and temporary. The public wrapper is the default.
+   *
    * @return \Drupal\file\FileInterface
    *   File entity.
    */
diff --git a/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php b/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php
index 7c43e9b..2675df0 100644
--- a/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php
+++ b/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php
@@ -155,6 +155,7 @@ public function assertSameFile(FileInterface $file1, FileInterface $file2) {
    * @param string $scheme
    *   Optional string indicating the stream scheme to use. Drupal core includes
    *   public, private, and temporary. The public wrapper is the default.
+   *
    * @return \Drupal\file\FileInterface
    *   File entity.
    */
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index 1497aba..a5889fa 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -408,7 +408,8 @@ function template_preprocess_text_format_wrapper(&$variables) {
  *   - tips: An array containing descriptions and a CSS ID in the form of
  *     'module-name/filter-id' (only used when $long is TRUE) for each
  *     filter in one or more text formats. Example:
- *     @code
+ *
+     * @code
  *       array(
  *         'Full HTML' => array(
  *           0 => array(
diff --git a/core/modules/filter/src/Plugin/FilterInterface.php b/core/modules/filter/src/Plugin/FilterInterface.php
index cdbe276..0f022cc 100644
--- a/core/modules/filter/src/Plugin/FilterInterface.php
+++ b/core/modules/filter/src/Plugin/FilterInterface.php
@@ -205,7 +205,8 @@ public function process($text, $langcode);
    *   If no restrictions apply, then FALSE must be returned.
    *
    *   Here is a concrete example, for a very granular filter:
-   *     @code
+   *
+       * @code
    *     array(
    *       'allowed' => array(
    *         // Allows any attribute with any value on the <div> tag.
diff --git a/core/modules/filter/tests/src/Kernel/FilterKernelTest.php b/core/modules/filter/tests/src/Kernel/FilterKernelTest.php
index 7b0c029..2cbd68a 100644
--- a/core/modules/filter/tests/src/Kernel/FilterKernelTest.php
+++ b/core/modules/filter/tests/src/Kernel/FilterKernelTest.php
@@ -862,7 +862,8 @@ public function testUrlFilter() {
    *   each value is again an associative array whose keys are filter output
    *   strings and whose values are Booleans indicating whether the output is
    *   expected or not. For example:
-   *   @code
+   *
+     * @code
    *   $tests = array(
    *     'Input string' => array(
    *       '<p>Input string</p>' => TRUE,
diff --git a/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php b/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php
index 4a9f7c4..0138e64 100644
--- a/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php
+++ b/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php
@@ -179,6 +179,7 @@ public function denormalize($data, $class, $format = NULL, array $context = [])
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity.
+   *
    * @return string
    *   The entity URI.
    */
diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index 1c00e03..10436b8 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -241,6 +241,7 @@ function image_path_flush($path) {
  *
  * @param $include_empty
  *   If TRUE a '- None -' option will be inserted in the options array.
+ *
  * @return
  *   Array of image styles both key and value are set to style name.
  */
diff --git a/core/modules/locale/src/LocaleConfigManager.php b/core/modules/locale/src/LocaleConfigManager.php
index 18f335c..018426b 100644
--- a/core/modules/locale/src/LocaleConfigManager.php
+++ b/core/modules/locale/src/LocaleConfigManager.php
@@ -621,6 +621,7 @@ public function updateConfigTranslations(array $names, array $langcodes = []) {
    *   Configuration override data.
    * @param array $translatable
    *   Translatable data array. @see self::getTranslatableData()
+   *
    * @return array
    *   Nested array of any items of $override_data which did not have keys in
    *   $translatable. May be empty if $override_data only had items which were
diff --git a/core/modules/locale/src/LocaleConfigSubscriber.php b/core/modules/locale/src/LocaleConfigSubscriber.php
index d06cb34..316ffbb 100644
--- a/core/modules/locale/src/LocaleConfigSubscriber.php
+++ b/core/modules/locale/src/LocaleConfigSubscriber.php
@@ -131,7 +131,8 @@ protected function updateLocaleStorage(StorableConfigBase $config, $langcode, ar
    *   The active configuration data or override data.
    * @param array|\Drupal\Core\StringTranslation\TranslatableMarkup[] $translatable
    *   The translatable array structure.
-   *   @see \Drupal\locale\LocaleConfigManager::getTranslatableData()
+   *
+     * @see \Drupal\locale\LocaleConfigManager::getTranslatableData()
    * @param string $langcode
    *   The language code to process the array with.
    * @param array $reference_config
diff --git a/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php b/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php
index a42d70f..bbb5b42 100644
--- a/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php
+++ b/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php
@@ -35,7 +35,8 @@
    *   by FieldStorageDefinitionInterface::getSettings(). As an example, for a
    *   composite destination primary key that is defined by an integer and a
    *   string, the returned value might look like:
-   *   @code
+   *
+     * @code
    *     return [
    *       'id' => [
    *         'type' => 'integer',
diff --git a/core/modules/migrate/src/Plugin/MigrateSourceInterface.php b/core/modules/migrate/src/Plugin/MigrateSourceInterface.php
index 480e5ed..a1fb498 100644
--- a/core/modules/migrate/src/Plugin/MigrateSourceInterface.php
+++ b/core/modules/migrate/src/Plugin/MigrateSourceInterface.php
@@ -59,7 +59,8 @@ public function __toString();
    *
    *   A composite source primary key that is defined by an integer and a string
    *   might look like this:
-   *   @code
+   *
+     * @code
    *     return [
    *       'id' => [
    *         'type' => 'integer',
diff --git a/core/modules/migrate/src/Plugin/Migration.php b/core/modules/migrate/src/Plugin/Migration.php
index cc8d804..eef4037 100644
--- a/core/modules/migrate/src/Plugin/Migration.php
+++ b/core/modules/migrate/src/Plugin/Migration.php
@@ -623,6 +623,7 @@ public function getMigrationDependencies() {
    * Find migration dependencies from the migration and the iterator plugins.
    *
    * @param $process
+   *
    * @return array
    */
   protected function findMigrationDependencies($process) {
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
index c8b44f8..90355dc 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
@@ -153,6 +153,7 @@ protected function moduleExists($module) {
    *   Name of the variable.
    * @param $default
    *   The default value.
+   *
    * @return mixed
    */
   protected function variableGet($name, $default) {
diff --git a/core/modules/node/src/NodeGrantDatabaseStorage.php b/core/modules/node/src/NodeGrantDatabaseStorage.php
index f6ae1f6..10a457f 100644
--- a/core/modules/node/src/NodeGrantDatabaseStorage.php
+++ b/core/modules/node/src/NodeGrantDatabaseStorage.php
@@ -285,6 +285,7 @@ public function deleteNodeRecords(array $nids) {
    *
    * @param array $node_access_grants
    *   An array of grants, as returned by node_access_grants().
+   *
    * @return \Drupal\Core\Database\Query\Condition
    *   A condition object to be passed to $query->condition().
    *
diff --git a/core/modules/node/src/NodePermissions.php b/core/modules/node/src/NodePermissions.php
index 1996360..9740c46 100644
--- a/core/modules/node/src/NodePermissions.php
+++ b/core/modules/node/src/NodePermissions.php
@@ -19,7 +19,8 @@ class NodePermissions {
    *
    * @return array
    *   The node type permissions.
-   *   @see \Drupal\user\PermissionHandlerInterface::getPermissions()
+   *
+     * @see \Drupal\user\PermissionHandlerInterface::getPermissions()
    */
   public function nodeTypePermissions() {
     $perms = [];
diff --git a/core/modules/node/tests/src/Traits/NodeCreationTrait.php b/core/modules/node/tests/src/Traits/NodeCreationTrait.php
index 6e0cf6a..b3bb5ba 100644
--- a/core/modules/node/tests/src/Traits/NodeCreationTrait.php
+++ b/core/modules/node/tests/src/Traits/NodeCreationTrait.php
@@ -43,7 +43,8 @@ public function getNodeByTitle($title, $reset = FALSE) {
    *   (optional) An associative array of settings for the node, as used in
    *   entity_create(). Override the defaults by specifying the key and value
    *   in the array, for example:
-   *   @code
+   *
+     * @code
    *     $this->drupalCreateNode(array(
    *       'title' => t('Hello, world!'),
    *       'type' => 'article',
diff --git a/core/modules/quickedit/src/MetadataGeneratorInterface.php b/core/modules/quickedit/src/MetadataGeneratorInterface.php
index a319ae4..a739fb2 100644
--- a/core/modules/quickedit/src/MetadataGeneratorInterface.php
+++ b/core/modules/quickedit/src/MetadataGeneratorInterface.php
@@ -15,6 +15,7 @@
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity, in the language in which one of its fields is being edited.
+   *
    * @return array
    *   An array containing metadata with the following keys:
    *   - label: the user-visible label for the entity in the given language.
@@ -28,6 +29,7 @@ public function generateEntityMetadata(EntityInterface $entity);
    *   The field values to be in-place edited.
    * @param string $view_mode
    *   The view mode the field should be rerendered in.
+   *
    * @return array
    *   An array containing metadata with the following keys:
    *   - label: the user-visible label for the field.
diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module
index 8d43298..dd661ff 100644
--- a/core/modules/rdf/rdf.module
+++ b/core/modules/rdf/rdf.module
@@ -145,7 +145,8 @@ function rdf_get_namespaces() {
  * @param array $mapping
  *   An array containing a mandatory 'properties' key and optional 'datatype',
  *   'datatype_callback' and 'type' keys. For example:
- *   @code
+ *
+   * @code
  *     array(
  *       'properties' => array('schema:interactionCount'),
  *       'datatype' => 'xsd:integer',
diff --git a/core/modules/rest/src/Routing/ResourceRoutes.php b/core/modules/rest/src/Routing/ResourceRoutes.php
index a8449f9..c7162db 100644
--- a/core/modules/rest/src/Routing/ResourceRoutes.php
+++ b/core/modules/rest/src/Routing/ResourceRoutes.php
@@ -58,6 +58,7 @@ public function __construct(ResourcePluginManager $manager, EntityTypeManagerInt
    *
    * @param \Drupal\Core\Routing\RouteBuildEvent $event
    *   The route build event.
+   *
    * @return array
    */
   public function onDynamicRouteEvent(RouteBuildEvent $event) {
diff --git a/core/modules/serialization/src/Normalizer/TimeStampItemNormalizerTrait.php b/core/modules/serialization/src/Normalizer/TimeStampItemNormalizerTrait.php
index 1ad0d8e..eaeed61 100644
--- a/core/modules/serialization/src/Normalizer/TimeStampItemNormalizerTrait.php
+++ b/core/modules/serialization/src/Normalizer/TimeStampItemNormalizerTrait.php
@@ -33,6 +33,7 @@
    *
    * @param array $normalized
    *   The normalized field data to process.
+   *
    * @return array
    *   The processed data.
    */
diff --git a/core/modules/shortcut/shortcut.api.php b/core/modules/shortcut/shortcut.api.php
index c60e456..c3dff6d 100644
--- a/core/modules/shortcut/shortcut.api.php
+++ b/core/modules/shortcut/shortcut.api.php
@@ -26,6 +26,7 @@
  *
  * @param $account
  *   The user account whose default shortcut set is being requested.
+ *
  * @return string
  *   The name of the shortcut set that this module recommends for that user, if
  *   there is one.
diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index 0e0ea2a..790947c 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -498,6 +498,7 @@ function _simpletest_batch_finished($success, $results, $operations, $elapsed) {
  *
  * @param $test_id
  *   The test ID to get the last test from.
+ *
  * @return array
  *   Array containing the last database prefix used and the last test class
  *   that ran.
@@ -572,7 +573,8 @@ function simpletest_log_read($test_id, $database_prefix, $test_class) {
  * @return array[]
  *   An array of tests keyed with the groups, and then keyed by test classes.
  *   For example:
- *   @code
+ *
+   * @code
  *     $groups['Block'] => array(
  *       'BlockTestCase' => array(
  *         'name' => 'Block functionality',
diff --git a/core/modules/simpletest/src/TestDiscovery.php b/core/modules/simpletest/src/TestDiscovery.php
index 9e6c32c..b6355df 100644
--- a/core/modules/simpletest/src/TestDiscovery.php
+++ b/core/modules/simpletest/src/TestDiscovery.php
@@ -142,6 +142,7 @@ public function registerTestNamespaces() {
    *
    * @return array
    *   An array of tests keyed by the the group name.
+   *
    * @code
    *     $groups['block'] => array(
    *       'Drupal\Tests\block\Functional\BlockTest' => array(
diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php
index 441b239..94cdba5 100644
--- a/core/modules/simpletest/src/WebTestBase.php
+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -433,7 +433,8 @@ protected function restoreBatch() {
    * @param array $values
    *   Array of values containing the untranslated string and its translation.
    *   For example:
-   *   @code
+   *
+     * @code
    *   array(
    *     '' => array('Sunday' => 'domingo'),
    *     'Long month name' => array('March' => 'marzo'),
@@ -900,7 +901,8 @@ protected function drupalGetXHR($path, array $options = [], array $headers = [])
    *   When working with form tests, the keys for an $edit element should match
    *   the 'name' parameter of the HTML of the form. For example, the 'body'
    *   field for a node has the following HTML:
-   *   @code
+   *
+     * @code
    *   <textarea id="edit-body-und-0-value" class="text-full form-textarea
    *    resize-vertical" placeholder="" cols="60" rows="9"
    *    name="body[0][value]"></textarea>
diff --git a/core/modules/system/src/Form/ThemeSettingsForm.php b/core/modules/system/src/Form/ThemeSettingsForm.php
index 03ded30..1509996 100644
--- a/core/modules/system/src/Form/ThemeSettingsForm.php
+++ b/core/modules/system/src/Form/ThemeSettingsForm.php
@@ -481,6 +481,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
    * @param string $path
    *   A path relative to the Drupal root or to the public files directory, or
    *   a stream wrapper URI.
+   *
    * @return mixed
    *   A valid path that can be displayed through the theme system, or FALSE if
    *   the path could not be validated.
diff --git a/core/modules/system/src/Tests/Cache/CacheTestBase.php b/core/modules/system/src/Tests/Cache/CacheTestBase.php
index e1bf798..7c7c3b8 100644
--- a/core/modules/system/src/Tests/Cache/CacheTestBase.php
+++ b/core/modules/system/src/Tests/Cache/CacheTestBase.php
@@ -25,6 +25,7 @@
    *   The variable the cache should contain.
    * @param $bin
    *   The bin the cache item was stored in.
+   *
    * @return
    *   TRUE on pass, FALSE on fail.
    */
diff --git a/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
index d215df5..716ac1d 100644
--- a/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
+++ b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
@@ -167,6 +167,7 @@ protected function getAdditionalCacheContextsForEntity(EntityInterface $entity)
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity to be tested, as created by createEntity().
+   *
    * @return array
    *   An array of the additional cache tags.
    *
diff --git a/core/modules/system/src/Tests/Installer/DistributionProfileTranslationQueryTest.php b/core/modules/system/src/Tests/Installer/DistributionProfileTranslationQueryTest.php
index 85b1e44..88184ee 100644
--- a/core/modules/system/src/Tests/Installer/DistributionProfileTranslationQueryTest.php
+++ b/core/modules/system/src/Tests/Installer/DistributionProfileTranslationQueryTest.php
@@ -126,6 +126,7 @@ public function testInstalled() {
    *
    * @param string $langcode
    *   The language code.
+   *
    * @return string
    *   Contents for the test .po file.
    */
diff --git a/core/modules/system/src/Tests/Installer/DistributionProfileTranslationTest.php b/core/modules/system/src/Tests/Installer/DistributionProfileTranslationTest.php
index a4c8091..5889658 100644
--- a/core/modules/system/src/Tests/Installer/DistributionProfileTranslationTest.php
+++ b/core/modules/system/src/Tests/Installer/DistributionProfileTranslationTest.php
@@ -122,6 +122,7 @@ public function testInstalled() {
    *
    * @param string $langcode
    *   The language code.
+   *
    * @return string
    *   Contents for the test .po file.
    */
diff --git a/core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageTest.php b/core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageTest.php
index dcde753..b29e068 100644
--- a/core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageTest.php
+++ b/core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageTest.php
@@ -35,6 +35,7 @@ protected function setUpLanguage() {
    *
    * @param string $langcode
    *   The language code.
+   *
    * @return string
    *   Contents for the test .po file.
    */
diff --git a/core/modules/system/src/Tests/Installer/InstallerTranslationQueryTest.php b/core/modules/system/src/Tests/Installer/InstallerTranslationQueryTest.php
index 86c20f7..96fa60d 100644
--- a/core/modules/system/src/Tests/Installer/InstallerTranslationQueryTest.php
+++ b/core/modules/system/src/Tests/Installer/InstallerTranslationQueryTest.php
@@ -69,6 +69,7 @@ public function testInstaller() {
    *
    * @param string $langcode
    *   The language code.
+   *
    * @return string
    *   Contents for the test .po file.
    */
diff --git a/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php b/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php
index 7a803e7..9f52958 100644
--- a/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php
+++ b/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php
@@ -130,6 +130,7 @@ public function testInstaller() {
    *
    * @param string $langcode
    *   The language code.
+   *
    * @return string
    *   Contents for the test .po file.
    */
diff --git a/core/modules/system/src/Tests/Routing/MockAliasManager.php b/core/modules/system/src/Tests/Routing/MockAliasManager.php
index 09f3636..0702a9d 100644
--- a/core/modules/system/src/Tests/Routing/MockAliasManager.php
+++ b/core/modules/system/src/Tests/Routing/MockAliasManager.php
@@ -73,6 +73,7 @@ public function getPathByAlias($alias, $langcode = NULL) {
    * {@inheritdoc}
    * @param $path
    * @param null $langcode
+   *
    * @return
    */
   public function getAliasByPath($path, $langcode = NULL) {
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index e38e8dd..7c4394c 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -460,6 +460,7 @@ function template_preprocess_entity_add_list(&$variables) {
  *   object created by authorize.php when the user authorizes the operation.
  * @param $page_title
  *   Optional string to use as the page title once redirected to authorize.php.
+ *
  * @return
  *   Nothing, this function just initializes variables in the user's session.
  */
@@ -486,6 +487,7 @@ function system_authorized_init($callback, $file, $arguments = [], $page_title =
  *
  * @param array $options
  *   Optional array of options to set on the \Drupal\Core\Url object.
+ *
  * @return \Drupal\Core\Url
  *   The full URL to authorize.php, using HTTPS if available.
  *
@@ -1147,6 +1149,7 @@ function system_rebuild_module_data() {
  * @param $show
  *   Possible values: REGIONS_ALL or REGIONS_VISIBLE. Visible excludes hidden
  *   regions.
+ *
  * @return
  *   An array of regions in the form $region['name'] = 'description'.
  */
@@ -1212,6 +1215,7 @@ function system_system_info_alter(&$info, Extension $file, $type) {
  *
  * @param $theme
  *   The name of a theme.
+ *
  * @return
  *   A string that is the region name.
  */
diff --git a/core/modules/system/tests/modules/entity_test/src/EntityTestPermissions.php b/core/modules/system/tests/modules/entity_test/src/EntityTestPermissions.php
index ccb66cf..ceb35ea 100644
--- a/core/modules/system/tests/modules/entity_test/src/EntityTestPermissions.php
+++ b/core/modules/system/tests/modules/entity_test/src/EntityTestPermissions.php
@@ -17,7 +17,8 @@ class EntityTestPermissions {
    *
    * @return array
    *   An array of entity_test_bundle permissions.
-   *   @see \Drupal\user\PermissionHandlerInterface::getPermissions()
+   *
+     * @see \Drupal\user\PermissionHandlerInterface::getPermissions()
    */
   public function entityTestBundlePermissions() {
     $perms = [];
diff --git a/core/modules/system/tests/modules/twig_extension_test/src/TwigExtension/TestExtension.php b/core/modules/system/tests/modules/twig_extension_test/src/TwigExtension/TestExtension.php
index 93be201..346583d 100644
--- a/core/modules/system/tests/modules/twig_extension_test/src/TwigExtension/TestExtension.php
+++ b/core/modules/system/tests/modules/twig_extension_test/src/TwigExtension/TestExtension.php
@@ -13,7 +13,8 @@ class TestExtension extends \Twig_Extension {
    * @return array
    *   A key/value array that defines custom Twig functions. The key denotes the
    *   function name used in the tag, e.g.:
-   *   @code
+   *
+     * @code
    *   {{ testfunc() }}
    *   @endcode
    *
@@ -31,7 +32,8 @@ public function getFunctions() {
    * @return array
    *   A key/value array that defines custom Twig filters. The key denotes the
    *   filter name used in the tag, e.g.:
-   *   @code
+   *
+     * @code
    *   {{ foo|testfilter }}
    *   @endcode
    *
diff --git a/core/modules/system/tests/src/Functional/Cache/CacheTestBase.php b/core/modules/system/tests/src/Functional/Cache/CacheTestBase.php
index f1439ea..08c4db5 100644
--- a/core/modules/system/tests/src/Functional/Cache/CacheTestBase.php
+++ b/core/modules/system/tests/src/Functional/Cache/CacheTestBase.php
@@ -22,6 +22,7 @@
    *   The variable the cache should contain.
    * @param $bin
    *   The bin the cache item was stored in.
+   *
    * @return
    *   TRUE on pass, FALSE on fail.
    */
diff --git a/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php b/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php
index aa9452a..f1f49a8 100644
--- a/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php
+++ b/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php
@@ -164,6 +164,7 @@ protected function getAdditionalCacheContextsForEntity(EntityInterface $entity)
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity to be tested, as created by createEntity().
+   *
    * @return array
    *   An array of the additional cache tags.
    *
diff --git a/core/modules/user/src/UserAuthInterface.php b/core/modules/user/src/UserAuthInterface.php
index 38cffc0..91f2cc3 100644
--- a/core/modules/user/src/UserAuthInterface.php
+++ b/core/modules/user/src/UserAuthInterface.php
@@ -14,6 +14,7 @@
    *   The user name to authenticate.
    * @param string $password
    *   A plain-text password, such as trimmed text from form values.
+   *
    * @return int|bool
    *   The user's uid on success, or FALSE on failure to authenticate.
    */
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 2d7d24a..b4f9bb5 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -246,6 +246,7 @@ function user_load($uid, $reset = FALSE) {
  *
  * @param string $mail
  *   String with the account's email address.
+ *
  * @return object|bool
  *   A fully-loaded $user object upon successful user load or FALSE if user
  *   cannot be loaded.
@@ -263,6 +264,7 @@ function user_load_by_mail($mail) {
  *
  * @param string $name
  *   String with the account's user name.
+ *
  * @return object|bool
  *   A fully-loaded $user object upon successful user load or FALSE if user
  *   cannot be loaded.
@@ -1119,7 +1121,8 @@ function user_role_load($rid) {
  *   value that evaluates to TRUE will cause the permission to be granted.
  *   Any value that evaluates to FALSE will cause the permission to be
  *   revoked.
- *   @code
+ *
+   * @code
  *     array(
  *       'administer nodes' => 0,                // Revoke 'administer nodes'
  *       'administer blocks' => FALSE,           // Revoke 'administer blocks'
diff --git a/core/modules/views/src/Plugin/Derivative/ViewsLocalTask.php b/core/modules/views/src/Plugin/Derivative/ViewsLocalTask.php
index bc6400c..5cae534 100644
--- a/core/modules/views/src/Plugin/Derivative/ViewsLocalTask.php
+++ b/core/modules/views/src/Plugin/Derivative/ViewsLocalTask.php
@@ -151,6 +151,7 @@ public function alterLocalTasks(&$local_tasks) {
    *
    * @return array
    *   A list of arrays containing the $view and $display_id.
+   *
    * @code
    * array(
    *   array($view, $display_id),
diff --git a/core/modules/views/src/Plugin/views/field/BulkForm.php b/core/modules/views/src/Plugin/views/field/BulkForm.php
index a253fc3..9dd54fc 100644
--- a/core/modules/views/src/Plugin/views/field/BulkForm.php
+++ b/core/modules/views/src/Plugin/views/field/BulkForm.php
@@ -302,6 +302,7 @@ public function viewsForm(&$form, FormStateInterface $form_state) {
    *
    * @param bool $filtered
    *   (optional) Whether to filter actions to selected actions.
+   *
    * @return array
    *   An associative array of operations, suitable for a select element.
    */
diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
index ef23c8d..160af84 100644
--- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
+++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
@@ -157,7 +157,8 @@ public function query() {
    *   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
+   *
+     * @code array('table' => $tablename, 'field' => $fieldname) @endcode
    */
   protected function addAdditionalFields($fields = NULL) {
     if (!isset($fields)) {
diff --git a/core/modules/views/src/Plugin/views/style/StylePluginBase.php b/core/modules/views/src/Plugin/views/style/StylePluginBase.php
index 1d6b491..fe5b2df 100644
--- a/core/modules/views/src/Plugin/views/style/StylePluginBase.php
+++ b/core/modules/views/src/Plugin/views/style/StylePluginBase.php
@@ -537,6 +537,7 @@ public function renderGroupingSets($sets) {
    *   Views 7.x-3.0-rc2. After Views 7.x-3.0 this boolean is only used if
    *   $groupings is an old-style string or if the rendered option is missing
    *   for a grouping instruction.
+   *
    * @return
    *   The grouped record set.
    *   A nested set structure is generated if multiple grouping fields are used.
diff --git a/core/modules/views/src/Routing/ViewPageController.php b/core/modules/views/src/Routing/ViewPageController.php
index 772103d..45b8eb6 100644
--- a/core/modules/views/src/Routing/ViewPageController.php
+++ b/core/modules/views/src/Routing/ViewPageController.php
@@ -19,6 +19,7 @@ class ViewPageController {
    *   The ID of the display.
    * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
    *   The route match.
+   *
    * @return null|void
    */
   public function handle($view_id, $display_id, RouteMatchInterface $route_match) {
diff --git a/core/modules/views/src/Views.php b/core/modules/views/src/Views.php
index dd241f7..ecf70a0 100644
--- a/core/modules/views/src/Views.php
+++ b/core/modules/views/src/Views.php
@@ -195,6 +195,7 @@ public static function getEnabledDisplayExtenders() {
    *
    * @return array
    *   A list of arrays containing the $view_id and $display_id.
+   *
    * @code
    * array(
    *   array($view_id, $display_id),
diff --git a/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php b/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
index a3646f0..9f49f49 100644
--- a/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
@@ -116,6 +116,7 @@ protected function clickSortLoadIdsFromOutput() {
    *   The message to display along with the assertion.
    * @param string $group
    *   The type of assertion - examples are "Browser", "PHP".
+   *
    * @return bool
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
@@ -134,6 +135,7 @@ protected function assertSubString($haystack, $needle, $message = '', $group = '
    *   The message to display along with the assertion.
    * @param string $group
    *   The type of assertion - examples are "Browser", "PHP".
+   *
    * @return bool
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
diff --git a/core/modules/views/tests/src/Kernel/Plugin/BlockDependenciesTest.php b/core/modules/views/tests/src/Kernel/Plugin/BlockDependenciesTest.php
index 1a9f32e..334f25a 100644
--- a/core/modules/views/tests/src/Kernel/Plugin/BlockDependenciesTest.php
+++ b/core/modules/views/tests/src/Kernel/Plugin/BlockDependenciesTest.php
@@ -67,7 +67,8 @@ public function testViewsBlock() {
    *   (optional) An associative array of settings for the block entity.
    *   Override the defaults by specifying the key and value in the array, for
    *   example:
-   *   @code
+   *
+     * @code
    *     $this->createBlock('system_powered_by_block', array(
    *       'label' => t('Hello, world!'),
    *     ));
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index f484f18..34aea2f 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -624,6 +624,7 @@ function views_disable_view(View $view) {
  * @param array $element
  *   An associative array containing the properties of the element.
  *   Properties used: #substitutions, #children.
+ *
  * @return array
  *   The $element with prepared variables ready for #theme 'form'
  *   in views_form_views_form.
@@ -798,6 +799,7 @@ function views_embed_view($name, $display_id = 'default') {
  *   Everything after #views-tab- is the display ID, e.g. page_1.
  * @param ...
  *   Any additional parameters will be passed as arguments.
+ *
  * @return array
  *   An array containing an object for each view item.
  */
diff --git a/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsListingTest.php b/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsListingTest.php
index cab99bd..d9f979d 100644
--- a/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsListingTest.php
+++ b/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsListingTest.php
@@ -115,6 +115,7 @@ public function testFilterViewsListing() {
    * Removes any non-visible elements from the passed array.
    *
    * @param array $elements
+   *
    * @return array
    */
   protected function filterVisibleElements($elements) {
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 7dcb3ba..98a1c82 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -45,7 +45,6 @@
     <exclude name="Drupal.Commenting.DocComment.TagsNotGrouped"/>
     <exclude name="Drupal.Commenting.DocComment.ParamGroup"/>
     <exclude name="Drupal.Commenting.DocComment.ShortSingleLine"/>
-    <exclude name="Drupal.Commenting.DocComment.TagGroupSpacing"/>
     <exclude name="Drupal.Commenting.DocComment.MissingShort"/>
   </rule>
   <rule ref="Drupal.Commenting.DocCommentStar"/>
diff --git a/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php b/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php
index 92612ae..b3f8da8 100644
--- a/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php
+++ b/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php
@@ -156,6 +156,7 @@ public function assertDirectoryPermissions($directory, $expected_mode, $message
    * @param $path
    *   Optional string with a directory path. If none is provided, a random
    *   name in the site's files directory will be used.
+   *
    * @return
    *   The path to the directory.
    */
@@ -180,6 +181,7 @@ public function createDirectory($path = NULL) {
    * @param $scheme
    *   Optional string indicating the stream scheme to use. Drupal core includes
    *   public, private, and temporary. The public wrapper is the default.
+   *
    * @return
    *   File URI.
    */
diff --git a/core/tests/Drupal/KernelTests/Core/Routing/ExceptionHandlingTest.php b/core/tests/Drupal/KernelTests/Core/Routing/ExceptionHandlingTest.php
index a791454..6c9cd10 100644
--- a/core/tests/Drupal/KernelTests/Core/Routing/ExceptionHandlingTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Routing/ExceptionHandlingTest.php
@@ -126,6 +126,7 @@ public function testExceptionResponseGeneratedForOriginalRequest() {
    * Sets the given path to use as the 404 page and triggers a 404.
    *
    * @param string $path
+   *
    * @return \Drupal\Core\Render\HtmlResponse
    *
    * @see \Drupal\system\Tests\Routing\ExceptionHandlingTest::testExceptionResponseGeneratedForOriginalRequest()
diff --git a/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php
index 3260f6e..efb3ea9 100644
--- a/core/tests/Drupal/Tests/BrowserTestBase.php
+++ b/core/tests/Drupal/Tests/BrowserTestBase.php
@@ -908,7 +908,8 @@ protected function submitForm(array $edit, $submit, $form_html_id = NULL) {
    *   When working with form tests, the keys for an $edit element should match
    *   the 'name' parameter of the HTML of the form. For example, the 'body'
    *   field for a node has the following HTML:
-   *   @code
+   *
+     * @code
    *   <textarea id="edit-body-und-0-value" class="text-full form-textarea
    *    resize-vertical" placeholder="" cols="60" rows="9"
    *    name="body[0][value]"></textarea>
diff --git a/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php b/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php
index b89d351..d6c2c05 100644
--- a/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php
+++ b/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php
@@ -162,9 +162,11 @@ public function testTimestamp($input, array $initial, array $transform) {
    * @param string $input
    *   Input argument for DateTimePlus().
    * @param array $initial
-   *   @see testTimestamp()
+   *
+     * @see testTimestamp()
    * @param array $transform
-   *   @see testTimestamp()
+   *
+     * @see testTimestamp()
    *
    * @dataProvider providerTestDateTimestamp
    */
@@ -180,12 +182,15 @@ public function testDateTimestamp($input, array $initial, array $transform) {
    *
    * @param \Drupal\Component\Datetime\DateTimePlus $date
    *   DateTimePlus to test.
+   *
    * @input mixed $input
    *   The original input passed to the test method.
    * @param array $initial
-   *   @see testTimestamp()
+   *
+     * @see testTimestamp()
    * @param array $transform
-   *   @see testTimestamp()
+   *
+     * @see testTimestamp()
    */
   public function assertDateTimestamp($date, $input, $initial, $transform) {
     // Check format.
diff --git a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php
index a77ad09..fa4cde6 100644
--- a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php
+++ b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php
@@ -97,6 +97,7 @@ public function providerTestProcess() {
    * bag so the setParameter() call effects the parent container as well.
    *
    * @param $service
+   *
    * @return \Symfony\Component\DependencyInjection\ContainerBuilder
    */
   protected function getSqliteContainer($service) {
@@ -115,6 +116,7 @@ protected function getSqliteContainer($service) {
    * bag so the setParameter() call effects the parent container as well.
    *
    * @param $service
+   *
    * @return \Symfony\Component\DependencyInjection\ContainerBuilder
    */
   protected function getMysqlContainer($service) {
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
index 692d011..5eaf2fa 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
@@ -112,6 +112,7 @@ public function testAccessWithDifferentRouteParameters() {
    *
    * @param \stdClass $object
    *   Any object, including prophesized mocks based on interfaces.
+   *
    * @return \Drupal\Core\Routing\RouteMatchInterface
    *   A prophesized RouteMatchInterface.
    */
diff --git a/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscoveryWithObject.php b/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscoveryWithObject.php
index 353b21d..1bb64cc 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscoveryWithObject.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscoveryWithObject.php
@@ -13,6 +13,7 @@ class TestDerivativeDiscoveryWithObject implements DeriverInterface {
    * {@inheritdoc}
    * @param string $derivative_id
    * @param array $base_plugin_definition
+   *
    * @return array
    */
   public function getDerivativeDefinition($derivative_id, $base_plugin_definition) {
@@ -23,6 +24,7 @@ public function getDerivativeDefinition($derivative_id, $base_plugin_definition)
   /**
    * {@inheritdoc}
    * @param array $base_plugin_definition
+   *
    * @return array
    */
   public function getDerivativeDefinitions($base_plugin_definition) {
diff --git a/core/tests/Drupal/Tests/Core/Routing/RouteMatchTestBase.php b/core/tests/Drupal/Tests/Core/Routing/RouteMatchTestBase.php
index 4d2a914..a31dea3 100644
--- a/core/tests/Drupal/Tests/Core/Routing/RouteMatchTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Routing/RouteMatchTestBase.php
@@ -22,6 +22,7 @@
    *   Parameters array
    * @param $raw_parameters
    *   Raw parameters array
+   *
    * @return \Drupal\Core\Routing\RouteMatchInterface
    */
   abstract protected function getRouteMatch($name, Route $route, array $parameters, array $raw_parameters);
diff --git a/core/tests/Drupal/Tests/EntityViewTrait.php b/core/tests/Drupal/Tests/EntityViewTrait.php
index d8c9d92..70f837b 100644
--- a/core/tests/Drupal/Tests/EntityViewTrait.php
+++ b/core/tests/Drupal/Tests/EntityViewTrait.php
@@ -30,6 +30,7 @@
    *   the current content language.
    * @param bool $reset
    *   (optional) Whether to clear the cache for this entity.
+   *
    * @return array
    *
    * @see drupal_render()
diff --git a/core/tests/bootstrap.php b/core/tests/bootstrap.php
index 50fef61..1c5c7f5 100644
--- a/core/tests/bootstrap.php
+++ b/core/tests/bootstrap.php
@@ -15,6 +15,7 @@
  *
  * @param string $scan_directory
  *   The directory that should be recursively scanned.
+ *
  * @return array
  *   An associative array of extension directories found within the scanned
  *   directory, keyed by extension name.